Implemented "Finish 1. world" -> Level is adjusted, Toolshop-tutorial is deactivated

Added resetConfirmDialog
Fixed minor bugs
This commit is contained in:
=
2018-01-12 17:50:43 +01:00
parent 60bc673ffc
commit 3ca689dd60
18 changed files with 374 additions and 219 deletions

View File

@ -538,20 +538,20 @@ public final class R {
public static final int src_atop = 0x7f08008d;
public static final int src_in = 0x7f08008e;
public static final int src_over = 0x7f08008f;
public static final int status_bar_latest_event_content = 0x7f080095;
public static final int submit_area = 0x7f080096;
public static final int tabMode = 0x7f080097;
public static final int text = 0x7f080099;
public static final int text2 = 0x7f08009a;
public static final int textSpacerNoButtons = 0x7f08009b;
public static final int time = 0x7f08009c;
public static final int title = 0x7f08009d;
public static final int title_template = 0x7f08009e;
public static final int topPanel = 0x7f0800bb;
public static final int up = 0x7f0800cd;
public static final int useLogo = 0x7f0800ce;
public static final int withText = 0x7f0800cf;
public static final int wrap_content = 0x7f0800d8;
public static final int status_bar_latest_event_content = 0x7f080096;
public static final int submit_area = 0x7f080097;
public static final int tabMode = 0x7f080098;
public static final int text = 0x7f08009a;
public static final int text2 = 0x7f08009b;
public static final int textSpacerNoButtons = 0x7f08009c;
public static final int time = 0x7f08009d;
public static final int title = 0x7f08009e;
public static final int title_template = 0x7f08009f;
public static final int topPanel = 0x7f0800bc;
public static final int up = 0x7f0800ce;
public static final int useLogo = 0x7f0800cf;
public static final int withText = 0x7f0800d0;
public static final int wrap_content = 0x7f0800d9;
}
public static final class integer {
public static final int abc_config_activityDefaultDur = 0x7f090000;
@ -619,7 +619,7 @@ public final class R {
public static final int abc_shareactionprovider_share_with = 0x7f0d0010;
public static final int abc_shareactionprovider_share_with_application = 0x7f0d0011;
public static final int abc_toolbar_collapse_description = 0x7f0d0012;
public static final int status_bar_notification_info_overflow = 0x7f0d004c;
public static final int status_bar_notification_info_overflow = 0x7f0d004e;
}
public static final class style {
public static final int AlertDialog_AppCompat = 0x7f0e0000;

File diff suppressed because one or more lines are too long

View File

@ -705,79 +705,80 @@ int id split_action_bar 0x7f08008c
int id src_atop 0x7f08008d
int id src_in 0x7f08008e
int id src_over 0x7f08008f
int id startscreen_gain_90_ep 0x7f080090
int id startscreen_play 0x7f080091
int id startscreen_settings 0x7f080092
int id startscreen_to_gl_test_screen 0x7f080093
int id startscreen_unlock_levels 0x7f080094
int id status_bar_latest_event_content 0x7f080095
int id submit_area 0x7f080096
int id tabMode 0x7f080097
int id task_completed_unlock_list 0x7f080098
int id text 0x7f080099
int id text2 0x7f08009a
int id textSpacerNoButtons 0x7f08009b
int id time 0x7f08009c
int id title 0x7f08009d
int id title_template 0x7f08009e
int id tool_button_animation_layer 0x7f08009f
int id tool_button_background_layer 0x7f0800a0
int id tool_button_progress_bar 0x7f0800a1
int id tool_inspector_description 0x7f0800a2
int id tool_inspector_imageview 0x7f0800a3
int id tool_inspector_level_view 0x7f0800a4
int id tool_inspector_pricebutton 0x7f0800a5
int id tool_inspector_title 0x7f0800a6
int id tool_upgrade_imageview 0x7f0800a7
int id tool_upgrade_pricebutton 0x7f0800a8
int id tool_upgrade_title 0x7f0800a9
int id tool_upgrade_value_new 0x7f0800aa
int id tool_upgrade_value_old 0x7f0800ab
int id toolbutton_1 0x7f0800ac
int id toolbutton_2 0x7f0800ad
int id toolbutton_3 0x7f0800ae
int id toolbutton_4 0x7f0800af
int id toolofferslot_slot 0x7f0800b0
int id toolofferslot_title 0x7f0800b1
int id toolshop_slot1 0x7f0800b2
int id toolshop_slot2 0x7f0800b3
int id toolshop_slot3 0x7f0800b4
int id toolshop_slot4 0x7f0800b5
int id toolshop_tool_offer_bottom_row 0x7f0800b6
int id toolshop_tool_offer_top_row 0x7f0800b7
int id toolshop_toolinspector 0x7f0800b8
int id toolshop_topbar 0x7f0800b9
int id toolslot_image 0x7f0800ba
int id topPanel 0x7f0800bb
int id topbar_energycount 0x7f0800bc
int id topbar_energycount_decrease 0x7f0800bd
int id topbar_energyview 0x7f0800be
int id topbar_layout 0x7f0800bf
int id topbar_leveldisplay 0x7f0800c0
int id topbar_levellayout 0x7f0800c1
int id topbar_levelprogress 0x7f0800c2
int id topbar_settings 0x7f0800c3
int id topbar_shapeshop 0x7f0800c4
int id topbar_starcount 0x7f0800c5
int id topbar_starcount_decrease 0x7f0800c6
int id topbar_starview 0x7f0800c7
int id topbar_toolshop 0x7f0800c8
int id tutorial_image_view 0x7f0800c9
int id tutorial_text_view 0x7f0800ca
int id unlockmessage_message 0x7f0800cb
int id unlockmessage_toolimage 0x7f0800cc
int id up 0x7f0800cd
int id useLogo 0x7f0800ce
int id withText 0x7f0800cf
int id worldbutton_energycount 0x7f0800d0
int id worldbutton_levelcount 0x7f0800d1
int id worldbutton_lock 0x7f0800d2
int id worldbutton_preview 0x7f0800d3
int id worldbutton_starcount 0x7f0800d4
int id worldbutton_title 0x7f0800d5
int id worlds_layout 0x7f0800d6
int id worlds_topbar 0x7f0800d7
int id wrap_content 0x7f0800d8
int id startscreen_finish_world_1 0x7f080090
int id startscreen_gain_90_ep 0x7f080091
int id startscreen_play 0x7f080092
int id startscreen_settings 0x7f080093
int id startscreen_to_gl_test_screen 0x7f080094
int id startscreen_unlock_levels 0x7f080095
int id status_bar_latest_event_content 0x7f080096
int id submit_area 0x7f080097
int id tabMode 0x7f080098
int id task_completed_unlock_list 0x7f080099
int id text 0x7f08009a
int id text2 0x7f08009b
int id textSpacerNoButtons 0x7f08009c
int id time 0x7f08009d
int id title 0x7f08009e
int id title_template 0x7f08009f
int id tool_button_animation_layer 0x7f0800a0
int id tool_button_background_layer 0x7f0800a1
int id tool_button_progress_bar 0x7f0800a2
int id tool_inspector_description 0x7f0800a3
int id tool_inspector_imageview 0x7f0800a4
int id tool_inspector_level_view 0x7f0800a5
int id tool_inspector_pricebutton 0x7f0800a6
int id tool_inspector_title 0x7f0800a7
int id tool_upgrade_imageview 0x7f0800a8
int id tool_upgrade_pricebutton 0x7f0800a9
int id tool_upgrade_title 0x7f0800aa
int id tool_upgrade_value_new 0x7f0800ab
int id tool_upgrade_value_old 0x7f0800ac
int id toolbutton_1 0x7f0800ad
int id toolbutton_2 0x7f0800ae
int id toolbutton_3 0x7f0800af
int id toolbutton_4 0x7f0800b0
int id toolofferslot_slot 0x7f0800b1
int id toolofferslot_title 0x7f0800b2
int id toolshop_slot1 0x7f0800b3
int id toolshop_slot2 0x7f0800b4
int id toolshop_slot3 0x7f0800b5
int id toolshop_slot4 0x7f0800b6
int id toolshop_tool_offer_bottom_row 0x7f0800b7
int id toolshop_tool_offer_top_row 0x7f0800b8
int id toolshop_toolinspector 0x7f0800b9
int id toolshop_topbar 0x7f0800ba
int id toolslot_image 0x7f0800bb
int id topPanel 0x7f0800bc
int id topbar_energycount 0x7f0800bd
int id topbar_energycount_decrease 0x7f0800be
int id topbar_energyview 0x7f0800bf
int id topbar_layout 0x7f0800c0
int id topbar_leveldisplay 0x7f0800c1
int id topbar_levellayout 0x7f0800c2
int id topbar_levelprogress 0x7f0800c3
int id topbar_settings 0x7f0800c4
int id topbar_shapeshop 0x7f0800c5
int id topbar_starcount 0x7f0800c6
int id topbar_starcount_decrease 0x7f0800c7
int id topbar_starview 0x7f0800c8
int id topbar_toolshop 0x7f0800c9
int id tutorial_image_view 0x7f0800ca
int id tutorial_text_view 0x7f0800cb
int id unlockmessage_message 0x7f0800cc
int id unlockmessage_toolimage 0x7f0800cd
int id up 0x7f0800ce
int id useLogo 0x7f0800cf
int id withText 0x7f0800d0
int id worldbutton_energycount 0x7f0800d1
int id worldbutton_levelcount 0x7f0800d2
int id worldbutton_lock 0x7f0800d3
int id worldbutton_preview 0x7f0800d4
int id worldbutton_starcount 0x7f0800d5
int id worldbutton_title 0x7f0800d6
int id worlds_layout 0x7f0800d7
int id worlds_topbar 0x7f0800d8
int id wrap_content 0x7f0800d9
int integer abc_config_activityDefaultDur 0x7f090000
int integer abc_config_activityShortDur 0x7f090001
int integer abc_max_action_buttons 0x7f090002
@ -922,67 +923,70 @@ int string playershape_name_wheel 0x7f0d0040
int string pre_start_screen_loading 0x7f0d0041
int string price_button_buy 0x7f0d0042
int string price_button_upgrade 0x7f0d0043
int string settings_reset 0x7f0d0044
int string short_menu_continue 0x7f0d0045
int string short_menu_exit 0x7f0d0046
int string short_menu_restart 0x7f0d0047
int string start_screen_gain_90_ep 0x7f0d0048
int string start_screen_play 0x7f0d0049
int string start_screen_to_gl_test_screen 0x7f0d004a
int string start_screen_unlock_all_levels 0x7f0d004b
int string status_bar_notification_info_overflow 0x7f0d004c
int string task_collect_energy_format_d 0x7f0d004d
int string task_collect_energy_progress_format_ddd 0x7f0d004e
int string task_collect_stars_format_d 0x7f0d004f
int string task_collect_stars_progress_format_ddd 0x7f0d0050
int string task_complete_world_format_d 0x7f0d0051
int string task_completed 0x7f0d0052
int string task_empty 0x7f0d0053
int string tool_description_bomb 0x7f0d0054
int string tool_description_locked_format_d 0x7f0d0055
int string tool_description_magnet 0x7f0d0056
int string tool_description_power_mushroom 0x7f0d0057
int string tool_description_ramp 0x7f0d0058
int string tool_description_spring 0x7f0d0059
int string tool_description_stasis 0x7f0d005a
int string tool_level_format_d 0x7f0d005b
int string tool_name_bomb 0x7f0d005c
int string tool_name_locked 0x7f0d005d
int string tool_name_magnet 0x7f0d005e
int string tool_name_power_mushroom 0x7f0d005f
int string tool_name_ramp 0x7f0d0060
int string tool_name_spring 0x7f0d0061
int string tool_name_stasis 0x7f0d0062
int string tool_upgrade_force 0x7f0d0063
int string tool_upgrade_none 0x7f0d0064
int string tool_upgrade_radius 0x7f0d0065
int string tool_upgrade_time 0x7f0d0066
int string tool_upgrade_title_format_sd 0x7f0d0067
int string tool_upgrade_title_placeholder 0x7f0d0068
int string tool_upgrade_value_max 0x7f0d0069
int string topbar_level_format_d 0x7f0d006a
int string topbar_level_placeholder 0x7f0d006b
int string topbar_toolshop 0x7f0d006c
int string tutorial_leveled_up_to_toolshop 0x7f0d006d
int string tutorial_place_ramp_air 0x7f0d006e
int string tutorial_place_ramp_air_2 0x7f0d006f
int string tutorial_place_ramp_gap 0x7f0d0070
int string tutorial_place_ramp_obstacle 0x7f0d0071
int string tutorial_place_tools 0x7f0d0072
int string tutorial_placeholder 0x7f0d0073
int string tutorial_switch_tools_switch 0x7f0d0074
int string tutorial_switch_tools_two_neccessary 0x7f0d0075
int string tutorial_toolshop_all_tools 0x7f0d0076
int string tutorial_toolshop_equip_spring 0x7f0d0077
int string tutorial_toolshop_inspector 0x7f0d0078
int string tutorial_toolshop_select_buy_spring 0x7f0d0079
int string tutorial_toolshop_toolbar 0x7f0d007a
int string tutorial_toolshop_welcome 0x7f0d007b
int string tutorial_welcome 0x7f0d007c
int string unlock_message_placeholder 0x7f0d007d
int string world_button_count_format_dd 0x7f0d007e
int string world_button_progress_placeholder 0x7f0d007f
int string world_button_title_placeholder 0x7f0d0080
int string reset_dialog_question 0x7f0d0044
int string settings_reset 0x7f0d0045
int string short_menu_continue 0x7f0d0046
int string short_menu_exit 0x7f0d0047
int string short_menu_restart 0x7f0d0048
int string start_screen_finish_world_1 0x7f0d0049
int string start_screen_gain_90_ep 0x7f0d004a
int string start_screen_play 0x7f0d004b
int string start_screen_to_gl_test_screen 0x7f0d004c
int string start_screen_unlock_all_levels 0x7f0d004d
int string status_bar_notification_info_overflow 0x7f0d004e
int string task_collect_energy_format_d 0x7f0d004f
int string task_collect_energy_progress_format_ddd 0x7f0d0050
int string task_collect_stars_format_d 0x7f0d0051
int string task_collect_stars_progress_format_ddd 0x7f0d0052
int string task_complete_world_format_d 0x7f0d0053
int string task_completed 0x7f0d0054
int string task_empty 0x7f0d0055
int string tool_description_bomb 0x7f0d0056
int string tool_description_locked_format_d 0x7f0d0057
int string tool_description_magnet 0x7f0d0058
int string tool_description_power_mushroom 0x7f0d0059
int string tool_description_ramp 0x7f0d005a
int string tool_description_spring 0x7f0d005b
int string tool_description_stasis 0x7f0d005c
int string tool_level_format_d 0x7f0d005d
int string tool_name_bomb 0x7f0d005e
int string tool_name_locked 0x7f0d005f
int string tool_name_magnet 0x7f0d0060
int string tool_name_power_mushroom 0x7f0d0061
int string tool_name_ramp 0x7f0d0062
int string tool_name_spring 0x7f0d0063
int string tool_name_stasis 0x7f0d0064
int string tool_upgrade_force 0x7f0d0065
int string tool_upgrade_none 0x7f0d0066
int string tool_upgrade_radius 0x7f0d0067
int string tool_upgrade_time 0x7f0d0068
int string tool_upgrade_title_format_sd 0x7f0d0069
int string tool_upgrade_title_placeholder 0x7f0d006a
int string tool_upgrade_value_max 0x7f0d006b
int string topbar_level_format_d 0x7f0d006c
int string topbar_level_placeholder 0x7f0d006d
int string topbar_toolshop 0x7f0d006e
int string tutorial_leveled_up_to_toolshop 0x7f0d006f
int string tutorial_place_ramp_air 0x7f0d0070
int string tutorial_place_ramp_air_2 0x7f0d0071
int string tutorial_place_ramp_gap 0x7f0d0072
int string tutorial_place_ramp_obstacle 0x7f0d0073
int string tutorial_place_tools 0x7f0d0074
int string tutorial_placeholder 0x7f0d0075
int string tutorial_spring_equipped 0x7f0d0076
int string tutorial_switch_tools_switch 0x7f0d0077
int string tutorial_switch_tools_two_neccessary 0x7f0d0078
int string tutorial_toolshop_all_tools 0x7f0d0079
int string tutorial_toolshop_equip_spring 0x7f0d007a
int string tutorial_toolshop_inspector 0x7f0d007b
int string tutorial_toolshop_select_buy_spring 0x7f0d007c
int string tutorial_toolshop_toolbar 0x7f0d007d
int string tutorial_toolshop_welcome 0x7f0d007e
int string tutorial_welcome 0x7f0d007f
int string unlock_message_placeholder 0x7f0d0080
int string world_button_count_format_dd 0x7f0d0081
int string world_button_progress_placeholder 0x7f0d0082
int string world_button_title_placeholder 0x7f0d0083
int style AlertDialog_AppCompat 0x7f0e0000
int style AlertDialog_AppCompat_Light 0x7f0e0001
int style Animation_AppCompat_Dialog 0x7f0e0002