diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml index d905efba..776df51a 100644 --- a/xml/page_topping_select8.xml +++ b/xml/page_topping_select8.xml @@ -13,24 +13,6 @@ EndIf Machine WakeUp - Var Seeker.orderFromNewTopping = 1 - - ;for 3 langs - ;inter-multi - If show_eng = "true" Then - If LanguageShow = "MYANMAR" Then - SetLanguage "MYANMAR" - Else - If LanguageShow = "MSC" Then - SetLanguage "MSC" - Else - SetLanguage "ENG" - EndIf - EndIf - Else - SetLanguage "THAI" - EndIf - Var TextSelfTestCntColor = "0x746253" Var UserSeletedSugar = 0 @@ -341,7 +323,7 @@ Var custom_coffee_level_medium_text_x = 540 Var custom_coffee_level_medium_price_x = 600 - + Var custom_coffee_level_right_text_x = 676 Var custom_coffee_level_darker_text_x = 880 Var custom_coffee_level_dark_text_x = 785 @@ -367,6 +349,21 @@ Var CustomSweetestTextX = 865 Var CustomSweetestPercentTextX = 935 Var CustomEspressoTextX = 793 + + Var CustomEspressoShotTextX = 892 + Var SugarZeroCalTextX = 890 + Var SugarTextX = 800 + + Var TampingCoffeeI_X = 696 + Var TampingCoffeeII_X = 790 + Var TampingCoffeeIII_X = 920 + + Var CustomMilkIntensityI_X = 679 + Var CustomMilkIntensityII_X = 795 + Var CustomMilkIntensityIII_X = 893 + + Var Paynow_text_X = 54 + Var Cancel_text_X = 53 Else Var DirImage = "ROOT/taobin_project/image/topping2" @@ -433,7 +430,7 @@ Var custom_coffee_level_medium_text_x = 560 Var custom_coffee_level_medium_price_x = 600 - + Var custom_coffee_level_right_text_x = 676 Var custom_coffee_level_darker_text_x = 880 Var custom_coffee_level_dark_text_x = 790 @@ -458,6 +455,75 @@ Var CustomSweetestPercentTextX = 935 Var CustomEspressoTextX = 804 + + Var CustomEspressoShotTextX = 892 + Var SugarZeroCalTextX = 890 + Var SugarTextX = 800 + + Var TampingCoffeeI_X = 696 + Var TampingCoffeeII_X = 790 + Var TampingCoffeeIII_X = 920 + + Var CustomMilkIntensityI_X = 694 + Var CustomMilkIntensityII_X = 804 + Var CustomMilkIntensityIII_X = 893 + + Var Paynow_text_X = 64 + Var Cancel_text_X = 53 + EndIf + + If LanguageShow = "MYANMAR" Then + Var CustomEspressoShotTextX = 892 + Var CustomEspressoTextX = 804 + Var SugarZeroCalTextX = 880 + + Var CustomSweetNotTextX = 310 + Var CustomSweetLittleTextX = 415 + Var CustomSweetLessTextX = 525 + Var CustomSweetPerfectTextX = 640 + Var CustomSweetExtraTextX = 757 + Var CustomSweetestTextX = 865 + + Var SugarTextX = 800 + Var custom_coffee_level_right_text_x = 676 + + Var TampingCoffeeI_X = 661 + Var TampingCoffeeII_X = 755 + Var TampingCoffeeIII_X = 885 + + Var CustomMilkIntensityI_X = 694 + Var CustomMilkIntensityII_X = 804 + Var CustomMilkIntensityIII_X = 893 + + Var Paynow_text_X = 54 + Var Cancel_text_X = 53 + EndIf + + If LanguageShow = "MSC" Then + Var CustomEspressoShotTextX = 872 + Var CustomEspressoTextX = 790 + Var SugarZeroCalTextX = 890 + + Var CustomSweetNotTextX = 340 + Var CustomSweetLittleTextX = 442 + Var CustomSweetLessTextX = 553 + Var CustomSweetPerfectTextX = 660 + Var CustomSweetExtraTextX = 760 + Var CustomSweetestTextX = 865 + + Var SugarTextX = 810 + Var custom_coffee_level_right_text_x = 686 + + Var TampingCoffeeI_X = 696 + Var TampingCoffeeII_X = 800 + Var TampingCoffeeIII_X = 920 + + Var CustomMilkIntensityI_X = 684 + Var CustomMilkIntensityII_X = 794 + Var CustomMilkIntensityIII_X = 893 + + Var Paynow_text_X = 44 + Var Cancel_text_X = 63 EndIf Var text_x_free_topping = text_x_add_oreo_price + text_x_free_adjust @@ -1051,6 +1117,23 @@ EndIf EndIf + If LanguageShow = "MYANMAR" Then + If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then + Var ShowTextSelfTestCountDown = "ခဏစောင့်ပေးပါ။ (" + MACHINE_SELF_TEST_COUNT_DOWN + Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")" + Else + Var ShowTextSelfTestCountDown = "ခဏစောင့်ပေးပါ။" + EndIf + EndIf + + If LanguageShow = "MSC" Then + If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then + Var ShowTextSelfTestCountDown = "请稍等一下 (" + MACHINE_SELF_TEST_COUNT_DOWN + Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")" + Else + Var ShowTextSelfTestCountDown = "请稍等一下" + EndIf + EndIf @@ -1165,6 +1248,14 @@ Var LanguageButtonEnable = "Invisible" Var show_eng_button_stage = "Enable" EndIf + + If SelectDrinkType = 1 Then + Var showname = NameLang[IndexDrinktType][LanguageShowByIndex] + Var showdesc = DescLang[IndexDrinktType][LanguageShowByIndex] + Else + Var showname = aliasName[LanguageShowByIndex] + Var showdesc = aliasName[LanguageShowByIndex] + EndIf DEBUGVAR LanguageButtonEnable DEBUGVAR show_eng_button_stage @@ -3813,9 +3904,29 @@ 460 350 195 - Var( DirImage + "/topping_revamp/bg_strawlid.png" ) + Var( DirImageInter + "/bg_strawlid.png" ) + + 810 + 575 + 500 + 72 + + 002090 + + + + + 810 + 495 + 500 + 72 + + 002091 + + + ; straw left @@ -4053,11 +4181,11 @@ 72 cold_button_state "No" - Var( DirImage + img_cold ) - Var( DirImage + img_cold_sel ) - Var( DirImage + img_cold_dis ) - Var( DirImage + img_cold_dis2 ) - Var( DirImage + img_cold_sel ) + "ROOT/taobin_project/image/topping_inter/bt_cold_no.png" + "ROOT/taobin_project/image/topping_inter/bt_cold_selected_no.png" + "ROOT/taobin_project/image/topping_inter/bt_cold_disable_no.png" + "ROOT/taobin_project/image/topping_inter/bt_cold_disable2_no.png" + "ROOT/taobin_project/image/topping_inter/bt_cold_selected_no.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -4094,6 +4222,13 @@ + + 40 + 8 + 60 + 42 + 000082 + @@ -4103,11 +4238,11 @@ 72 blend_button_state "No" - Var( DirImage + img_smth ) - Var( DirImage + img_smth_sel ) - Var( DirImage + img_smth_dis ) - Var( DirImage + img_smth_dis2 ) - Var( DirImage + img_smth_sel ) + "ROOT/taobin_project/image/topping_inter/bt_smoothie_no.png" + "ROOT/taobin_project/image/topping_inter/bt_smoothie_selected_no.png" + "ROOT/taobin_project/image/topping_inter/bt_smoothie_disable_no.png" + "ROOT/taobin_project/image/topping_inter/bt_smoothie_disable2_no.png" + "ROOT/taobin_project/image/topping_inter/bt_smoothie_selected_no.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -4145,6 +4280,13 @@ + + 30 + 8 + 200 + 42 + 000083 + @@ -4174,7 +4316,7 @@ text_price_d3 - 872 + 892 85 KanitRegularTTF text_show_eng @@ -4218,8 +4360,18 @@ 64 showAdjust - Var( DirImage + "/topping_revamp/bg_top_custom_recipe.png" ) + Var( DirImageInter + "/bg_top_custom.png" ) + + + 40 + 10 + 500 + 70 + + 002020 + + ; ; @@ -4232,9 +4384,19 @@ 0 0 ExtraTopping - Var( DirImage + "/topping_revamp/bg_custom_sweet_level.png" ) + Var( DirImageInter + "/bg_custom_sweet_level.png" ) + + 130 + 15 + 500 + 46 + + 002030 + + + ; sugar1 - 800 + SugarTextX 50 250 - 20 + 25 002056 @@ -4912,17 +5036,17 @@ 67 15 50 - 20 + 25 KanitRegularTTF 0x84776F "(Free)" - 890 + SugarZeroCalTextX 50 250 - 20 + 25 002057 @@ -4961,9 +5085,19 @@ 0 0 "Enable" - Var( DirImage + "/topping_revamp/bg_custom_sweet_level.png" ) + Var( DirImageInter + "/bg_custom_sweet_level.png" ) + + 130 + 15 + 500 + 46 + + 002030 + + + ; sugar1 - + CustomSweetNotTextX CustomSweetTextY - KanitRegularTTF - CustomSweetState[0] - 16 - 0x513C2F - CustomSweetrText[0] - - - CustomSweetNotPercentTextX - CustomSweetPercentTextY - KanitRegularTTF - CustomSweetState[0] - 14 - 0x84776F - CustomSweetrPercent[0] + "CustomSweetState[0]" + 250 + 22 + + 002070 + "(0%)" + 15 + 0x84776F + CustomSweetLittleTextX CustomSweetTextY - KanitRegularTTF - CustomSweetState[1] - 16 - 0x513C2F - CustomSweetrText[1] + "CustomSweetState[1]" + 250 + 22 + + 002071 + "(30%)" + 15 + 0x84776F + - - CustomSweetLittlePercentTextX - CustomSweetPercentTextY - KanitRegularTTF - CustomSweetState[1] - 14 - 0x84776F - CustomSweetrPercent[1] - - CustomSweetLessTextX CustomSweetTextY - KanitRegularTTF - CustomSweetState[2] - 16 - 0x513C2F - CustomSweetrText[2] + "CustomSweetState[2]" + 250 + 22 + + 002072 + "(60%)" + 15 + 0x84776F + - - CustomSweetLessPercentTextX - CustomSweetPercentTextY - KanitRegularTTF - CustomSweetState[2] - 14 - 0x84776F - CustomSweetrPercent[2] - - - CustomSweetPerfectTextX CustomSweetPercentTextY - KanitRegularTTF - CustomSweetState[3] - 16 - 0x513C2F - CustomSweetrText[3] - - - - CustomSweetPerfectPercentTextX - CustomSweetPercentTextY - KanitRegularTTF - CustomSweetState[3] - 14 - 0x84776F - CustomSweetrPercent[3] + "CustomSweetState[3]" + 250 + 22 + + 002073 + "(100%)" + 15 + 0x84776F + CustomSweetExtraTextX CustomSweetTextY - KanitRegularTTF - CustomSweetState[4] - 16 - 0x513C2F - CustomSweetrText[4] + "CustomSweetState[4]" + 250 + 22 + + 002074 + "(120%)" + 15 + 0x84776F + - - CustomSweetExtraPercentTextX - CustomSweetPercentTextY - KanitRegularTTF - CustomSweetState[4] - 14 - 0x84776F - CustomSweetrPercent[4] - - - CustomSweetestTextX CustomSweetTextY - KanitRegularTTF - CustomSweetState[5] - 16 - 0x513C2F - CustomSweetrText[5] - - - - - CustomSweetestPercentTextX - CustomSweetPercentTextY - KanitRegularTTF - CustomSweetState[5] - 14 - 0x84776F - CustomSweetrPercent[5] + "CustomSweetState[5]" + 250 + 22 + + 002075 + "(140%)" + 15 + 0x84776F + @@ -5538,9 +5634,19 @@ 0 0 "Enable" - Var( DirImage + "/topping_revamp/bg_custom_sweet_level.png" ) + Var( DirImageInter + "/bg_custom_sweet_level.png" ) + + 130 + 15 + 500 + 46 + + 002030 + + + ; sugar1 - 694 + CustomMilkIntensityI_X CustomEspressoTextY - KanitRegularTTF CustomMilkState[0] - 16 - 0x513C2F - CustomMilkText[0] + + 000126 + - 804 + CustomMilkIntensityII_X CustomEspressoTextY - KanitRegularTTF + 500 + 18 CustomMilkState[1] - 16 - 0x513C2F - CustomMilkText[1] + + 000127 + - 893 + CustomMilkIntensityIII_X CustomEspressoTextY - KanitRegularTTF + 500 + 23 CustomMilkState[2] - 16 - 0x513C2F - CustomMilkText[2] - - - ; Additional Price - - 935 - CustomEspressoTextY - KanitRegularTTF - CustomMilkState[2] - 16 - 0x84776F - MilkIncreasePriceText + + 000128 + MilkIncreasePriceText + 15 + 0x84776F + @@ -7689,9 +7760,19 @@ 0 0 - Var( DirImage + "/topping_revamp/bg_custom_espesso_level.png" ) + Var( DirImageInter + "/bg_custom_espesso_level.png" ) + + 130 + 15 + 500 + 46 + + 002031 + + + - 694 + CustomMilkIntensityI_X CustomEspressoTextY - KanitRegularTTF + 500 + 25 CustomMilkState[0] - 16 - 0x513C2F - CustomMilkText[0] + + 000126 + - 804 + CustomMilkIntensityII_X CustomEspressoTextY - KanitRegularTTF + 500 + 25 CustomMilkState[1] - 16 - 0x513C2F - CustomMilkText[1] + + 000127 + - 893 + CustomMilkIntensityIII_X CustomEspressoTextY - KanitRegularTTF + 500 + 23 CustomMilkState[2] - 16 - 0x513C2F - CustomMilkText[2] - - - ; Additional Price - - 935 - CustomEspressoTextY - KanitRegularTTF - CustomMilkState[2] - 16 - 0x84776F - MilkIncreasePriceText + + 000128 + MilkIncreasePriceText + 15 + 0x84776F + @@ -8520,9 +8601,19 @@ 0 0 - Var( DirImage + "/bg_custom_coffee_water_level.png" ) + Var( DirImageInter + "/bg_custom_coffee_water_level.png" ) + + 130 + 15 + 500 + 46 + + 000104 + + + - 696 + TampingCoffeeI_X CustomCoffeeTextY - KanitRegularTTF + 500 + 20 showCoffeeTamping - 16 - 0x513C2F - CustomCoffeeTampingText[0] + + 002080 + - 790 + TampingCoffeeII_X CustomCoffeeTextY - KanitRegularTTF + 500 + 20 showCoffeeTamping - 16 - 0x513C2F - CustomCoffeeTampingText[1] + + 002081 + - 920 + TampingCoffeeIII_X CustomCoffeeTextY - KanitRegularTTF + 500 + 20 showCoffeeTamping - 16 - 0x513C2F - CustomCoffeeTampingText[2] + + 002082 + @@ -9208,8 +9303,17 @@ 72 SpecialMix - Var( DirImage + "/topping_revamp/bg_top_special_mix.png" ) + Var( DirImageInter + "/bg_top_custom_special.png" ) + + 40 + 10 + 1000 + 70 + + 002021 + + ; @@ -9223,9 +9327,19 @@ 0 0 - Var( DirImage + "/topping_revamp/bg_special_ovaltine.png") + Var( DirImageInter + "/bg_special_topping.png") + + 120 + 0 + 500 + 72 + + 002038 + + + @@ -10457,10 +10638,10 @@ ; next @@ -10599,13 +10785,19 @@ Var showText4 = "Invisible" - If show_eng = "true" Then - Var showname = menu_name_eng_hot - Var showdesc = menu_desc_eng_hot + If ENABLE_LANGUAGE_COUNT > 2 Then + Var showname = NameLang[0][LanguageShowByIndex] + Var showdesc = DescLang[0][LanguageShowByIndex] Else - Var showname = menu_name_thai_hot - Var showdesc = menu_desc_thai_hot + If show_eng = "true" Then + Var showname = menu_name_eng_blender + Var showdesc = menu_desc_eng_blender + Else + Var showname = menu_name_thai_blender + Var showdesc = menu_desc_thai_blender + EndIf EndIf + Var Seeker.NameDrinkEN = menu_name_eng_hot Var Seeker.NameDrinkTH = menu_name_thai_hot @@ -10637,12 +10829,17 @@ Var showText4 = "Invisible" - If show_eng = "true" Then - Var showname = menu_name_eng_cold - Var showdesc = menu_desc_eng_cold + If ENABLE_LANGUAGE_COUNT > 2 Then + Var showname = NameLang[1][LanguageShowByIndex] + Var showdesc = DescLang[1][LanguageShowByIndex] Else - Var showname = menu_name_thai_cold - Var showdesc = menu_desc_thai_cold + If show_eng = "true" Then + Var showname = menu_name_eng_blender + Var showdesc = menu_desc_eng_blender + Else + Var showname = menu_name_thai_blender + Var showdesc = menu_desc_thai_blender + EndIf EndIf Var Seeker.NameDrinkEN = menu_name_eng_cold @@ -10682,13 +10879,21 @@ Var showText4 = "Enable" - If show_eng = "true" Then - Var showname = menu_name_eng_blender - Var showdesc = menu_desc_eng_blender + If ENABLE_LANGUAGE_COUNT > 2 Then + Var showname = NameLang[2][LanguageShowByIndex] + Var showdesc = DescLang[2][LanguageShowByIndex] Else - Var showname = menu_name_thai_blender - Var showdesc = menu_desc_thai_blender + SAVELOG "Enable lang < 2" + DEBUGVAR ENABLE_LANGUAGE_COUNT + If show_eng = "true" Then + Var showname = menu_name_eng_blender + Var showdesc = menu_desc_eng_blender + Else + Var showname = menu_name_thai_blender + Var showdesc = menu_desc_thai_blender + EndIf EndIf + Var Seeker.NameDrinkEN = menu_name_eng_blender Var Seeker.NameDrinkTH = menu_name_thai_blender @@ -11141,13 +11346,17 @@ EndIf If SelectDrinkType = 0 Then - - If show_eng = "true" Then - Var showname = NameDrink - Var showdesc = DrinkDescription + If ENABLE_LANGUAGE_COUNT > 2 Then + Var showname = aliasName[LanguageShowByIndex] + Var showdesc = aliasName[LanguageShowByIndex] Else - Var showname = NameDrinkTH - Var showdesc = DrinkDescriptionTH + If show_eng = "true" Then + Var showname = NameDrink + Var showdesc = DrinkDescription + Else + Var showname = NameDrinkTH + Var showdesc = DrinkDescriptionTH + EndIf EndIf EndIf