diff --git a/image/page_doing/brewing_txt_adv16.png b/image/page_doing/brewing_txt_adv16.png index d0043d05..69604645 100644 Binary files a/image/page_doing/brewing_txt_adv16.png and b/image/page_doing/brewing_txt_adv16.png differ diff --git a/image/page_doing/brewing_txt_adv16_en.png b/image/page_doing/brewing_txt_adv16_en.png index 25da78a3..87d2fa17 100644 Binary files a/image/page_doing/brewing_txt_adv16_en.png and b/image/page_doing/brewing_txt_adv16_en.png differ diff --git a/image/page_drink_disable_n2/bn_New_americano_Double_Shot.png b/image/page_drink_disable_n2/bn_New_americano_Double_Shot.png index dc3f5d05..ec8e16b1 100644 Binary files a/image/page_drink_disable_n2/bn_New_americano_Double_Shot.png and b/image/page_drink_disable_n2/bn_New_americano_Double_Shot.png differ diff --git a/image/page_drink_n/bn_New_americano_Double_Shot.png b/image/page_drink_n/bn_New_americano_Double_Shot.png index d1d3f6e8..47f8da5c 100644 Binary files a/image/page_drink_n/bn_New_americano_Double_Shot.png and b/image/page_drink_n/bn_New_americano_Double_Shot.png differ diff --git a/image/page_drink_picture2_n/bn_New_americano_Double_Shot.png b/image/page_drink_picture2_n/bn_New_americano_Double_Shot.png index b6a95473..a2d32276 100644 Binary files a/image/page_drink_picture2_n/bn_New_americano_Double_Shot.png and b/image/page_drink_picture2_n/bn_New_americano_Double_Shot.png differ diff --git a/image/page_drink_press_n/bn_New_americano_Double_Shot.png b/image/page_drink_press_n/bn_New_americano_Double_Shot.png index eae28af5..2b82e3d5 100644 Binary files a/image/page_drink_press_n/bn_New_americano_Double_Shot.png and b/image/page_drink_press_n/bn_New_americano_Double_Shot.png differ diff --git a/inter/tha/menu/lang.tsv b/inter/tha/menu/lang.tsv index 9ce12ae0..241dbb44 100644 --- a/inter/tha/menu/lang.tsv +++ b/inter/tha/menu/lang.tsv @@ -96,6 +96,7 @@ Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746254 + Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746254 000073 Pay now ซื้อเลย 现在付款 Pay now ဝယ်မယ် Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746254 Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF diff --git a/inter/tha/xml/multi/control_and_lang_swith.ev b/inter/tha/xml/multi/control_and_lang_swith.ev index a8a4925e..63b1c2d3 100644 --- a/inter/tha/xml/multi/control_and_lang_swith.ev +++ b/inter/tha/xml/multi/control_and_lang_swith.ev @@ -136,7 +136,7 @@ DEBUGVAR CocktailShow Var ButtonLanguageListYPosition = 450 - 38 - +__CMD "NoNeedMenuName" "-" "-" "-" Var CatalogLayoutV3Loaded = 1 diff --git a/inter/tha/xml/multi/v3/page_catalog_group_20_baht.lxml b/inter/tha/xml/multi/v3/page_catalog_group_20_baht.lxml index c8dc04bc..d6964eb9 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_20_baht.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_20_baht.lxml @@ -60,7 +60,7 @@ If inst_show_pepsi_7up_counter = 0 Then RefreshAll - Var inst_show_pepsi_7up_counter = 4 + Var inst_show_pepsi_7up_counter = 15 EndIf EndIf ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc" diff --git a/inter/tha/xml/multi/v3/page_catalog_group_20_baht.skt b/inter/tha/xml/multi/v3/page_catalog_group_20_baht.skt index bebf0809..784af2e3 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_20_baht.skt +++ b/inter/tha/xml/multi/v3/page_catalog_group_20_baht.skt @@ -62,7 +62,7 @@ If inst_show_pepsi_7up_counter = 0 Then RefreshAll - Var inst_show_pepsi_7up_counter = 4 + Var inst_show_pepsi_7up_counter = 15 EndIf EndIf ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc" diff --git a/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml b/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml index 8a7e40f0..e61e8e7a 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml @@ -71,7 +71,7 @@ If inst_show_coffee_counter = 0 Then RefreshAll - Var inst_show_coffee_counter = 4 + Var inst_show_coffee_counter = 15 EndIf EndIf ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc" diff --git a/inter/tha/xml/multi/v3/page_catalog_group_coffee.skt b/inter/tha/xml/multi/v3/page_catalog_group_coffee.skt index f77bb893..d6bd567b 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_coffee.skt +++ b/inter/tha/xml/multi/v3/page_catalog_group_coffee.skt @@ -73,7 +73,7 @@ If inst_show_coffee_counter = 0 Then RefreshAll - Var inst_show_coffee_counter = 4 + Var inst_show_coffee_counter = 15 EndIf EndIf ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc" diff --git a/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.lxml b/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.lxml index 3c8c4228..e85ec4e1 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.lxml @@ -64,7 +64,7 @@ If inst_show_pepsi_7up_counter = 0 Then RefreshAll - Var inst_show_pepsi_7up_counter = 4 + Var inst_show_pepsi_7up_counter = 15 EndIf EndIf ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc" diff --git a/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.skt b/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.skt index c18430f3..53bf173e 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.skt +++ b/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.skt @@ -67,7 +67,7 @@ If inst_show_pepsi_7up_counter = 0 Then RefreshAll - Var inst_show_pepsi_7up_counter = 4 + Var inst_show_pepsi_7up_counter = 15 EndIf EndIf ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc" diff --git a/inter/tha/xml/multi/v3/page_catalog_group_tea.lxml b/inter/tha/xml/multi/v3/page_catalog_group_tea.lxml index f087d46a..794dad07 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_tea.lxml +++ b/inter/tha/xml/multi/v3/page_catalog_group_tea.lxml @@ -61,7 +61,7 @@ If inst_show_tea_counter = 0 Then RefreshAll - Var inst_show_tea_counter = 4 + Var inst_show_tea_counter = 15 EndIf EndIf ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc" diff --git a/inter/tha/xml/multi/v3/page_catalog_group_tea.skt b/inter/tha/xml/multi/v3/page_catalog_group_tea.skt index 6364a69f..7d322251 100644 --- a/inter/tha/xml/multi/v3/page_catalog_group_tea.skt +++ b/inter/tha/xml/multi/v3/page_catalog_group_tea.skt @@ -64,7 +64,7 @@ If inst_show_tea_counter = 0 Then RefreshAll - Var inst_show_tea_counter = 4 + Var inst_show_tea_counter = 15 EndIf EndIf ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc" diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index ba496c5a..22d64650 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -1408,18 +1408,18 @@ Name=TaiwaneseTea,file=page_catalog_group_pro_taiwanese_tea.skt ชาไต้หวันสละ Taiwanese\nSalak Tea ชาไต้หวัน สละ น้ำตาล Taiwanese Tea Salak Sugar 12-02-01-0118 12-02-02-0118 - bn_Taiwanese_Tea_Salak.png - - - posi1 - - - - Name=AmericanoPro,file=page_catalog_group_pro_americano.skt - ระเบิดเทพสุริยัน Solar God’s Explosion กาแฟ และน้ำ Espresso, Water 12-01-01-0003 12-01-02-0001 - bn_hot_america_no_Banner.png 12-21-01-0003 12-21-02-0001 - posi1 - - - - + ระเบิดเทพสุริยัน Solar God’s\nExplosion กาแฟ และน้ำ Espresso, Water 12-01-01-0003 12-01-02-0001 - bn_hot_america_no_Banner.png 12-21-01-0003 12-21-02-0001 - posi1 - - - - สะท้านพิภพ Groundbreaking กาแฟ น้ำ และ ลิ้นจี่ Espresso, Lychee,\nSugar, Water 12-01-01-0017 12-01-02-0017 - bn_hot_lychee_america_no.png 12-21-01-0017 12-21-02-0017 - posi1 - - - - อัศจรรย์ยันหว่าง Miracle of Midday กาแฟ น้ำ และ ยูซุ Espresso, Yuzu,\nSugar, Water 12-01-01-0040 12-01-02-0040 - bn_hot_yuzu_america_no.png 12-21-01-0040 12-21-02-0040 - posi1 - - - - พระรามแปรงฟัน Rama’s Morning Mint กาแฟ น้ำ และ มินต์ Espresso, Mint,\nSugar, Water 12-01-01-0058 12-01-02-0058 - bn_Mint_Americano.png 12-21-01-0058 12-21-02-0058 - posi1 - - - - - วานรสอนง่าย Tamed Monkey’s Secret กาแฟ น้ำ และ น้ำเชื่อมมะพร้าว Espresso, Coconut,\nSugar, Water 12-01-01-0068 12-01-02-0068 - bn_hot_coconut_america_no.png 12-21-01-0068 12-21-02-0068 - posi1 - - - - - สีดาร้อยหมัด Sita’s Hundred Punches เจมิลา กาแฟ และน้ำแข็ง Jemila, Espresso And Ice - 12-01-02-0075 - bn_hot_america_no_jemila.png - 12-21-02-0075 - posi1 - - - - - สิงหลโค่นภูผา Lion’s Mountain Slayer กาแฟ และน้ำ Dark shot Espresso, Water 12-01-01-0081 12-01-02-0081 - bn_hot_blackcoffee_Banner.png 12-21-01-0081 12-21-02-0081 - posi1 - - - - + วานรสอนง่าย Tamed Monkey’s\nSecret กาแฟ น้ำ และ น้ำเชื่อมมะพร้าว Espresso, Coconut,\nSugar, Water 12-01-01-0068 12-01-02-0068 - bn_hot_coconut_america_no.png 12-21-01-0068 12-21-02-0068 - posi1 - - - - + สีดาร้อยหมัด Sita’s Hundred\nPunches เจมิลา กาแฟ และน้ำแข็ง Jemila, Espresso And Ice - 12-01-02-0075 - bn_hot_america_no_jemila.png - 12-21-02-0075 - posi1 - - - - + สิงหลโค่นภูผา Lion’s Mountain\nSlayer กาแฟ และน้ำ Dark shot Espresso, Water 12-01-01-0081 12-01-02-0081 - bn_hot_blackcoffee_Banner.png 12-21-01-0081 12-21-02-0081 - posi1 - - - - สโนไวท์ร้อยแรงม้า 100 Hp Snow White กาแฟ แอปเปิ้ล Coffee Apple 12-01-01-0088 12-01-02-0088 - bn_Apple_Americano_Banner.png 12-21-01-0088 12-21-02-0088 - posi1 - - - - อัคคาสาดสี Firestorm of Colors กาแฟ แอปเปิ้ล Coffee Apple - 12-01-02-0091 - bn_Apple_Frop_Longback_Banner.png - 12-21-02-0091 - posi1 - - - - ราตรีนี้ระเริง Let's party tonight! กาแฟ น้ำ และ สตรอเบอรี Coffee, Water, and Strawberry 12-01-01-0093 12-01-02-0093 - bn_hot_strawberry_america_no.png 12-21-01-0093 12-21-02-0093 - posi1 - - - - กัศยปคชสาร Kashyapa's Elephant กาแฟ น้ำ และ สละ Coffee, Water, and Salak 12-01-01-0094 12-01-02-0094 - bn_hot_salak_america_no.png 12-21-01-0094 12-21-02-0094 - posi1 - - - - - ฤๅษีติดหวาน Sweet-Toothed Hermit กาแฟ น้ำ และ คาราเมล Coffee, Water, and Caramel 12-01-01-0095 12-01-02-0095 - bn_hot_caramel_america_no.png 12-21-01-0095 12-21-02-0095 - posi1 - - - - + ฤๅษีติดหวาน Sweet-Toothed\nHermit กาแฟ น้ำ และ คาราเมล Coffee, Water, and Caramel 12-01-01-0095 12-01-02-0095 - bn_hot_caramel_america_no.png 12-21-01-0095 12-21-02-0095 - posi1 - - - - ปักษาแหวกรัง Birds Breaking Free กาแฟ น้ำ และ บ๊วย Coffee, Water, and Ume 12-01-01-0096 12-01-02-0096 - bn_hot_ume_america_no.png 12-21-01-0096 12-21-02-0096 - posi1 - - - - ดีดไม่รู้ล้ม Unfallen Bounce กาแฟ น้ำ และ เครื่องดื่มเต่าทรงพลัง Coffee, Water, and Tao Power Drink 12-01-01-0097 12-01-02-0097 - bn_hot_tao_energy_america_no.png 12-21-01-0097 12-21-02-0097 - posi1 - - - - แข็งไม่รู้จบ Endlessly Strong กาแฟx2 และน้ำ Double Coffee and Water 12-01-01-0098 12-01-02-0098 - bn_New_americano_Double_Shot.png 12-21-01-0098 12-21-02-0098 - posi1 - - - - diff --git a/ui/lang.tsv b/ui/lang.tsv index 9ce12ae0..241dbb44 100644 --- a/ui/lang.tsv +++ b/ui/lang.tsv @@ -96,6 +96,7 @@ Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746254 + Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746254 000073 Pay now ซื้อเลย 现在付款 Pay now ဝယ်မယ် Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746254 Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 28d5c5bd..db62bcd4 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -224,8 +224,10 @@ EndIf If BoxID = 123456 Then Var AppleFarmFestivalPro = 0 Var HappyTriosPro = 0 - Var TaiwaneseTeaPro = 1 - Var SchoolOvaltinePro = 1 + Var TaiwaneseTeaPro = 0 + Var SchoolOvaltinePro = 0 + Var AmericanoPro = 1 + Var TaiwaneseTeaPro = 1 EndIf If BoxID = 173149 Then @@ -244,14 +246,6 @@ EndIf DEBUGVAR ConfigNumer -If ConfigNumer >= 1762 Then - Var ToppingNewUINewSystem = 1 -EndIf - -If ConfigNumer >= 1763 Then - Var ToppingNewUINewSystemStep2 = 1 -EndIf - ; override again Var CleanFeedbackFlag = 1 diff --git a/xml/function2.inc b/xml/function2.inc index c7efd97f..88de8916 100644 --- a/xml/function2.inc +++ b/xml/function2.inc @@ -707,6 +707,7 @@ EndIf + Var ButtonConfirmOrderState = "Enable" DEBUGVAR SelectDrinkType DEBUGVAR showShotEnable diff --git a/xml/page_catalog_group_pro_americano.xml b/xml/page_catalog_group_pro_americano.xml index 01dfe6b1..68a043f9 100644 --- a/xml/page_catalog_group_pro_americano.xml +++ b/xml/page_catalog_group_pro_americano.xml @@ -150,7 +150,8 @@ KanitMediumTTF 0x322B26 showengText - "Solar God’s Explosion" + "Solar God’s +Explosion" 16 @@ -403,7 +404,8 @@ KanitMediumTTF 0x322B26 showengText - "Solar God’s Explosion" + "Solar God’s +Explosion" 16 @@ -2184,7 +2186,8 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "Tamed Monkey’s Secret" + "Tamed Monkey’s +Secret" 16 @@ -2438,7 +2441,8 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "Tamed Monkey’s Secret" + "Tamed Monkey’s +Secret" 16 @@ -2693,7 +2697,8 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "Sita’s Hundred Punches" + "Sita’s Hundred +Punches" 16 @@ -2942,7 +2947,8 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "Sita’s Hundred Punches" + "Sita’s Hundred +Punches" 16 @@ -3192,7 +3198,8 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "Lion’s Mountain Slayer" + "Lion’s Mountain +Slayer" 16 @@ -3445,7 +3452,8 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "Lion’s Mountain Slayer" + "Lion’s Mountain +Slayer" 16 @@ -5719,7 +5727,8 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "Sweet-Toothed Hermit" + "Sweet-Toothed +Hermit" 16 @@ -5972,7 +5981,8 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "Sweet-Toothed Hermit" + "Sweet-Toothed +Hermit" 16 diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml index eee57e11..2cd9986c 100644 --- a/xml/page_topping_select8.xml +++ b/xml/page_topping_select8.xml @@ -23,7 +23,7 @@ Var TextSelfTestCntColor = "0x746253" Var UserSeletedSugar = 0 - SAVELOG "Event Open Select 8" + SAVELOG "Event Open Select 8 version 1.1" If NoWaitMachineEnable = 1 Then Var ConfirmDrinkButtonState = "Enable" @@ -932,6 +932,7 @@ Var MenuReasonStage = "Invisible" Var AdvertOpened = "false" Var SpiralReady = 0 + Var ButtonConfirmOrderState = "Enable" 1000 @@ -4486,10 +4487,10 @@ Topping "Load" PD_CODE1 Var high_light_drink_type = "Invisible" - + Var ButtonConfirmOrderState = "Disable" - - +Var PriceDrinkTmpShow = "---" + Refresh 43 @@ -4545,8 +4546,11 @@ Var topping_price_refresh = 0 Topping "Load" PD_CODE2 + Var high_light_drink_type = "Invisible" + Var ButtonConfirmOrderState = "Disable" + Var PriceDrinkTmpShow = "---" - +Refresh 40 @@ -4602,9 +4606,11 @@ Var topping_price_refresh = 0 Topping "Load" PD_CODE3 + Var high_light_drink_type = "Invisible" + Var ButtonConfirmOrderState = "Disable" - - +Var PriceDrinkTmpShow = "---" +Refresh 30 @@ -11371,6 +11377,8 @@ 1785 "ROOT/taobin_project/image/topping_inter/bn_next.png" "ROOT/taobin_project/image/topping_inter/bp_next.png" + "ROOT/taobin_project/image/topping_inter/bp_next.png" + ButtonConfirmOrderState "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -11434,849 +11442,6 @@ - Var fun = "function2" - DEBUGVAR fun - Var img_cold_no_flag = 0 - Var img_smth_no_flag = 0 - - If hot_button_state = "Disable2" Then - If blend_button_state = "Disable2" Then - Var img_cold_no_flag = 1 - Else - Var img_cold_no_flag = 1 - Var img_smth_no_flag = 2 - EndIf - EndIf - - If PriceD1 = PriceD2 Then - Var img_cold_no_flag = 1 - EndIf - - If hot_button_state = "Disable2" Then - If cold_button_state = "Disable2" Then - Var img_smth_no_flag = 1 - EndIf - EndIf - - - If img_cold_no_flag = 1 Then - SAVELOG "Cold Image change." - Var img_cold = "/bt_cold_no.png" - Var img_cold_sel = "/bt_cold_selected_no.png" - Var img_cold_dis = "/bt_cold_disable_no.png" - Var img_cold_dis2 = "/bt_cold_disable2_no.png" - If PD_CODE2 = "12-05-02-0016" Then - Var img_cold = "/bt_normal_no.png" - Var img_cold_sel = "/bt_normal_selected_no.png" - Var img_cold_dis = "/bt_cold_disable_no.png" - Var img_cold_dis2 = "/bt_cold_disable2_no.png" - EndIf - Else - Var img_cold = "/bt_cold.png" - Var img_cold_sel = "/bt_cold_selected.png" - Var img_cold_dis = "/bt_cold_disable.png" - Var img_cold_dis2 = "/bt_cold_disable2.png" - EndIf - - If img_smth_no_flag = 1 Then - SAVELOG "Smoothies change img. 1" - Var img_smth = "/bt_smoothie_no.png" - Var img_smth_sel = "/bt_smoothie_selected_no.png" - Var img_smth_dis = "/bt_smoothie_disable_no.png" - Var img_smth_dis2 = "/bt_smoothie_disable2_no.png" - Else - If img_smth_no_flag = 2 Then - SAVELOG "Smoothies change img. 2" - Var img_smth = "/bt_smoothie_sub2.png" - Var img_smth_sel = "/bt_smoothie_selected_sub2.png" - Var img_smth_dis = "/bt_smoothie_disable_sub2.png" - Var img_smth_dis2 = "/bt_smoothie_disable2_sub2.png" - Else - - Var img_smth = "/bt_smoothie.png" - Var img_smth_sel = "/bt_smoothie_selected.png" - Var img_smth_dis = "/bt_smoothie_disable.png" - Var img_smth_dis2 = "/bt_smoothie_disable2.png" - EndIf - EndIf - - Var img_cold = "/bt_cold_no.png" - Var img_cold_sel = "/bt_cold_selected_no.png" - Var img_cold_dis = "/bt_cold_disable_no.png" - Var img_cold_dis2 = "/bt_cold_disable2_no.png" - If PD_CODE2 = "12-05-02-0016" Then - Var img_cold = "/bt_normal_no.png" - Var img_cold_sel = "/bt_normal_selected_no.png" - Var img_cold_dis = "/bt_cold_disable_no.png" - Var img_cold_dis2 = "/bt_cold_disable2_no.png" - EndIf - - - Var img_smth = "/bt_smoothie_no.png" - Var img_smth_sel = "/bt_smoothie_selected_no.png" - Var img_smth_dis = "/bt_smoothie_disable_no.png" - Var img_smth_dis2 = "/bt_smoothie_disable2_no.png" - - DEBUGVAR menu_name_thai_cold - SAVELOG "FUNCTION2" - - - Var TOPPING_PRICE = 0 - - Var SelectDrinkType = 0 - - ; Set default - If SelectCountDrinkType = 1 Then - If DefaultDrinkType = 1 Then - Var hot_button_state = "PressForever" - EndIf - If DefaultDrinkType = 2 Then - Var cold_button_state = "PressForever" - EndIf - If DefaultDrinkType = 3 Then - Var blend_button_state = "PressForever" - EndIf - - EndIf - - If hot_button_state = "PressForever" Then - Var PriceDrinkNoTop = PriceD1 - Var UserSelectProductCode = PD_CODE1 - - If showShotEnable = "Disable" Then - If CustomCoffeeEnable = "False" Then - Var showShotEnable = "Enable" - EndIf - EndIf - - If showCustomCoffee = "Invisible" Then - If CustomCoffeeEnable = "True" Then - Var showCustomCoffee = "Enable" - EndIf - EndIf - - Var showText4 = "Invisible" - - If ENABLE_LANGUAGE_COUNT > 2 Then - Var showname = NameLang[0][LanguageShowByIndex] - Var showdesc = DescLang[0][LanguageShowByIndex] - Else - If show_eng = "true" Then - Var showname = menu_name_eng_hot - Var showdesc = menu_desc_eng_hot - Else - Var showname = menu_name_thai_hot - Var showdesc = menu_desc_thai_hot - EndIf - EndIf - - Var Seeker.NameDrinkEN = menu_name_eng_hot - Var Seeker.NameDrinkTH = menu_name_thai_hot - - Var text_hot_color = "0xFFFFFF" - Var text_cold_color = "0x84776F" - Var text_blender_color = "0x84776F" - - Var SelectDrinkType = 1 - - Machine PreparCup - EndIf - - If cold_button_state = "PressForever" Then - Var PriceDrinkNoTop = PriceD2 - Var OriginalPrice = OriginalPriceD2 - Var UserSelectProductCode = PD_CODE2 - - If showShotEnable = "Disable" Then - If CustomCoffeeEnable = "False" Then - Var showShotEnable = "Enable" - EndIf - EndIf - - If showCustomCoffee = "Invisible" Then - If CustomCoffeeEnable = "True" Then - Var showCustomCoffee = "Enable" - EndIf - EndIf - - Var showText4 = "Invisible" - - If ENABLE_LANGUAGE_COUNT > 2 Then - Var showname = NameLang[1][LanguageShowByIndex] - Var showdesc = DescLang[1][LanguageShowByIndex] - Else - If show_eng = "true" Then - Var showname = menu_name_eng_cold - Var showdesc = menu_desc_eng_cold - Else - Var showname = menu_name_thai_cold - Var showdesc = menu_desc_thai_cold - EndIf - EndIf - - Var Seeker.NameDrinkEN = menu_name_eng_cold - Var Seeker.NameDrinkTH = menu_name_thai_cold - - Var text_hot_color = "0x84776F" - Var text_cold_color = "0xFFFFFF" - Var text_blender_color = "0x84776F" - - Var SelectDrinkType = 1 - - Machine PreparCup - EndIf - - If blend_button_state = "PressForever" Then - Var PriceDrinkNoTop = PriceD3 - Var OriginalPrice = OriginalPriceD3 - Var UserSelectProductCode = PD_CODE3 - - If showShotEnable = "Invisible" Then - - Else - Var showShotEnable = "Disable" - EndIf - - If CustomCoffeeEnable = "True" Then - Var showCustomCoffee = "Enable" - Var showCoffeeWater = "Invisible" - - Var CurrentCoffeeWaterId = toppingID7Default - Var CustomCoffeeWaterState[0] = "Enable" - Var CustomCoffeeWaterState[1] = "PressForever" - Var CustomCoffeeWaterState[2] = "Enable" - Var CustomCoffeeWaterState[3] = "Enable" - Var CustomCoffeeWaterState[4] = "Enable" - EndIf - - Var showText4 = "Enable" - - If ENABLE_LANGUAGE_COUNT > 2 Then - Var showname = NameLang[2][LanguageShowByIndex] - Var showdesc = DescLang[2][LanguageShowByIndex] - Else - 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 - - Var text_hot_color = "0x84776F" - Var text_cold_color = "0x84776F" - Var text_blender_color = "0xFFFFFF" - - Var SelectDrinkType = 1 - - Machine PreparCup - EndIf - - Var OatMilkAddAmount = 5 - Var CerealMilkPrice = "(+฿5)" - - Var OreoPrice = 10 - Var CocoaPrice = 10 - Var OvaltinePrice = 10 - Var StrawberryPrice = 5 - Var YuzuPrice = 5 - Var MilkIncreasePrice = 5 - Var TaiwaneseTeaIncreasePrice = 5 - - Var EnergyPriceLevel1 = 5 - Var EnergyPriceLevel2 = 10 - - Var CoffeePriceLevel1 = 15 - Var CoffeePriceLevel2 = 25 - - Var OreoPriceText = "(+10)" - Var CocoaPriceText = "(+10)" - Var OvaltinePriceText = "(+10)" - Var StrawberryPriceText = "(+5)" - Var YuzuPriceText = "(+5)" - Var MilkIncreasePriceText = "(+5)" - Var TaiwaneseTeaIncreasePriceText = "(+5)" - Var CollagenPriceText = "(Free)" - - Var EnergyTextLevel1 = "(+5)" - Var EnergyTextLevel2 = "(+10)" - - Var CoffeeTextLevel1 = "(+15)" - Var CoffeeTextLevel2 = "(+25)" - - - - Var CerealMilkAddAmount = SubMenuPrice1 - PriceDrinkNoTop - - If CerealMilkAddAmount = 0 Then - Var CerealMilkPrice = "(+฿10)" - - Else - Var CerealMilkPrice = "(+฿" + CerealMilkAddAmount - Var CerealMilkPrice = CerealMilkPrice + ")" - - Var CerealMilkPrice = "(+฿10)" - EndIf - - DEBUGVAR SubMenuPrice1 - DEBUGVAR CerealMilkAddAmount - - - - DEBUGVAR PriceDrinkNoTop - DEBUGVAR PriceDiff - DEBUGVAR showShotEnable - Var TOPPING_PRICE = 0 - - If ShotCoffeePremium = "Press" Then - If blendedState = "Press" Then - Var PriceDrinkTmp = PriceDrinkNoTop - EndIf - - Var blendedState = "Disable" - Var TOPPING_PRICE = 0 - - Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 - - Var topping2 = toppingID2index2 - - Var DisableUsingCode = "true" - - Var showText7 = "Enable" - - SAVELOG "Select premi normal shot" - - Else - - If showShotEnable = "Press" Then - If blendedState = "Press" Then - Var PriceDrinkTmp = PriceDrinkNoTop - EndIf - - Var blendedState = "Disable" - - Var TOPPING_PRICE = 0 - - ;Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2 - Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 - - Var topping2 = toppingID2index2 - - Var DisableUsingCode = "true" - - Var showText7 = "Enable" - - SAVELOG "Select add normal shot" - Else - If blendedState = "Disable" Then - Var blendedState = "Enable" - EndIf - - - Var PriceDrinkTmp = PriceDrinkNoTop - Var topping2 = toppingID2index1 - Var DisableUsingCode = "false" - SAVELOG "Deselect add normal shot" - - Var showText7 = "Invisible" - - EndIf - - EndIf - - ; Post Topping - If SugarZeroCalEnable = "true" Then - Var sugarToppingID = 1000 - If SugarZeroCalCheck = "PressForever" Then - Var sugarToppingID = 1001 - Else - Var sugarToppingID = 1000 - EndIf - EndIf - - - If SugarZeroCalEnable = "true" Then - If SugarZeroCalOption = "Enable" Then - If SugarZeroCalCheck = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + SugarZeroCalPrice - Var Seeker.UseFreeSugarZeroCalTopping = 1 - Else - Var Seeker.UseFreeSugarZeroCalTopping = 0 - EndIf - EndIf - EndIf - - DEBUGVAR showOreoAddEnable - DEBUGVAR TOPPING_PRICE - - ; Oreo - Var strMulti6_1 = "TPID:321+multiply:0" - ; Ovaltine - Var strMulti6_2 = "TPID:323+multiply:0" - ; Coaco - Var strMulti6_3 = "TPID:322+multiply:0" - - Var strMulti6_4 = "" - - Var strMulti6_5 = "TPID=324,multiply=0" - - - ; light-milk - Var strMulti11_1 = "TPID:541+multiply:0" - ; normal-milk - Var strMulti11_2 = "TPID:542+multiply:0" - ; rich-milk - Var strMulti11_3 = "TPID:543+multiply:0" - ; normal-taiwanese-tea - Var strMulti11_4 = "TPID:546+multiply:0" - ; rich-taiwanese-tea - Var strMulti11_5 = "TPID:547+multiply:0" - - - If showOreoAddEnable = "Press" Then - Var TOPPING_PRICE = TOPPING_PRICE + OreoPrice - Var strMulti6_1 = "TPID=321,multiply=1" - Var DisableUsingCode = "true" - DEBUGVAR DisableUsingCode - Else - - ;Var PriceDrinkTmp = PriceDrinkNoTop - - Var strMulti6_1 = "TPID=320,multiply=0" - - Var DisableUsingCode = "false" - DEBUGVAR DisableUsingCode - - EndIf - - - If showOvaltineEnable = "Press" Then - Var TOPPING_PRICE = TOPPING_PRICE + OvaltinePrice - ;Var topping6 = toppingID6index5 - Var strMulti6_2 = "TPID=323,multiply=1" - Var DisableUsingCode = "true" - DEBUGVAR DisableUsingCode - Else - ;Var PriceDrinkTmp = PriceDrinkNoTop - - Var strMulti6_2 = "TPID=320,multiply=0" - - Var DisableUsingCode = "false" - DEBUGVAR DisableUsingCode - - EndIf - - If showCocoaEnable = "Press" Then - Var TOPPING_PRICE = TOPPING_PRICE + CocoaPrice - ;Var topping6 = toppingID6index3 - Var strMulti6_3 = "TPID=322,multiply=1" - Var DisableUsingCode = "true" - DEBUGVAR DisableUsingCode - Else - - ;Var PriceDrinkTmp = PriceDrinkNoTop - - Var strMulti6_3 = "TPID=320,multiply=0" - - Var DisableUsingCode = "false" - DEBUGVAR DisableUsingCode - - EndIf - - If CustomMilkState[0] = "PressForever" Then - Var strMulti11_1 = "TPID=541,multiply=1" - Var DisableUsingCode = "true" - DEBUGVAR DisableUsingCode - Else - Var strMulti11_1 = "TPID=542,multiply=0" - Var DisableUsingCode = "false" - DEBUGVAR DisableUsingCode - EndIf - - If CustomMilkState[1] = "PressForever" Then - Var strMulti11_2 = "TPID=542,multiply=1" - Var DisableUsingCode = "true" - DEBUGVAR DisableUsingCode - Else - Var strMulti11_2 = "TPID=542,multiply=0" - Var DisableUsingCode = "false" - DEBUGVAR DisableUsingCode - EndIf - - If CustomMilkState[2] = "PressForever" Then - Var strMulti11_3 = "TPID=543,multiply=1" - Var DisableUsingCode = "true" - DEBUGVAR DisableUsingCode - Else - Var strMulti11_3 = "TPID=542,multiply=0" - Var DisableUsingCode = "false" - DEBUGVAR DisableUsingCode - EndIf - - If CustomTaiwaneseTeaState[0] = "PressForever" Then - Var strMulti11_4 = "TPID=546,multiply=1" - Var DisableUsingCode = "true" - DEBUGVAR DisableUsingCode - Else - Var strMulti11_4 = "TPID=546,multiply=0" - Var DisableUsingCode = "false" - DEBUGVAR DisableUsingCode - EndIf - - If CustomTaiwaneseTeaState[1] = "PressForever" Then - Var strMulti11_5 = "TPID=547,multiply=1" - Var DisableUsingCode = "true" - DEBUGVAR DisableUsingCode - Else - Var strMulti11_5 = "TPID=547,multiply=0" - Var DisableUsingCode = "false" - DEBUGVAR DisableUsingCode - EndIf - - - If CustomTaiwaneseTeaState[1] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + TaiwaneseTeaIncreasePrice - EndIf - - If CustomMilkState[2] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + MilkIncreasePrice - EndIf - - If CustomEnergyState[0] = "Press" Then - Var TOPPING_PRICE = TOPPING_PRICE + EnergyPriceLevel1 - Var topping12 = toppingID12index2 - Else - If CustomEnergyState[1] = "Press" Then - - Else - Var topping12 = toppingID12index1 - EndIf - EndIf - - - If CustomEnergyState[1] = "Press" Then - Var TOPPING_PRICE = TOPPING_PRICE + EnergyPriceLevel2 - Var topping12 = toppingID12index3 - Else - If CustomEnergyState[0] = "Press" Then - - Else - Var topping12 = toppingID12index1 - EndIf - EndIf - - If showShotEnableSoda = "Press" Then - Var TOPPING_PRICE = TOPPING_PRICE + CoffeePriceLevel1 - EndIf - - - If CollagenState = "Press" Then - Var TOPPING_PRICE = TOPPING_PRICE + CollagenToppingPrice - Var topping3 = toppingID3index2 - Var Seeker.UseFreeCollagenTopping = 1 - Else - Var topping3 = toppingID3index1 - Var Seeker.UseFreeCollagenTopping = 0 - EndIf - - - - If CerealMilkEnable = "Press" Then - If MenuCodeName1 = "Cereal-Milk" Then - Var TOPPING_PRICE = TOPPING_PRICE + CerealMilkAddAmount - Var DisableUsingCode = "true" - Var UserSelectProductCode = SubMenuProductCode1 - EndIf - - Else - - EndIf - - If showStrawberryEnable = "Press" Then - Var TOPPING_PRICE = TOPPING_PRICE + StrawberryPrice - If TOPPING6 = "all-volcano" Then - Var strMulti6_5 = "TPID=324,multiply=1" - EndIf - - If TOPPING6 = "syrup-topping" Then - Var strMulti6_5 = "TPID=91,multiply=1" - EndIf - - Var DisableUsingCode = "true" - Else - - - If TOPPING6 = "all-volcano" Then - Var strMulti6_5 = "TPID=320,multiply=1" - EndIf - - If TOPPING6 = "syrup-topping" Then - Var strMulti6_5 = "TPID=90,multiply=1" - EndIf - - - Var DisableUsingCode = "false" - DEBUGVAR DisableUsingCode - - EndIf - - - If showYuzuEnable = "Press" Then - Var TOPPING_PRICE = TOPPING_PRICE + YuzuPrice - If TOPPING6 = "all-volcano" Then - Var strMulti6_6 = "TPID=325,multiply=1" - EndIf - If TOPPING6 = "syrup-topping" Then - Var strMulti6_6 = "TPID=92,multiply=1" - EndIf - Var DisableUsingCode = "true" - Else - - - If TOPPING6 = "all-volcano" Then - Var strMulti6_6 = "TPID=320,multiply=1" - EndIf - If TOPPING6 = "syrup-topping" Then - Var strMulti6_6 = "TPID=90,multiply=1" - EndIf - - Var DisableUsingCode = "false" - DEBUGVAR DisableUsingCode - - EndIf - - - Var CustomCoffeeDefault = "true" - DEBUGVAR showCustomCoffee - DEBUGVAR CustomCoffeeDefault - - If showShotEnable = "Press" Then - ; Invisible showCustomCoffee - Var showCustomCoffee = "Invisible" - Else - If CustomCoffeeEnable = "True" Then - Var showCustomCoffee = "Enable" - EndIf - EndIf - - If showShotEnable = "Disable" Then - If showShotNormal = "Enable" Then - Var showShotNormal = "Press" - EndIf - EndIf - - If showCustomCoffee = "Enable" Then - - If showCoffeeWater = "Enable" Then - If CurrentCoffeeWaterId = toppingID7Default Then - Else - Var CustomCoffeeDefault = "false" - EndIf - EndIf - - If showCoffeeQuantity = "Enable" Then - If CurrentCoffeeQuantityId = toppingID2Default Then - Else - Var CustomCoffeeDefault = "false" - EndIf - EndIf - - If showCoffeeLevel = "Enable" Then - If CurrentCoffeeLevelId = toppingID9Default Then - Else - Var CustomCoffeeDefault = "false" - EndIf - EndIf - - If showCoffeeTamping = "Enable" Then - If CurrentCoffeeTampingId = toppingID8Default Then - Else - Var CustomCoffeeDefault = "false" - EndIf - EndIf - - DEBUGVAR CustomCoffeeDefault - If CustomCoffeeDefault = "false" Then - If showShotEnable = "Enable" Then - ;Var showShotEnable = "Disable" - EndIf - Else - If showShotEnable = "Invisible" Then - - Else - If blend_button_state = "PressForever" Then - Else - Var showShotEnable = "Enable" - EndIf - EndIf - EndIf - - - If CustomCoffeeQuantityState[0] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price1 - EndIf - If CustomCoffeeQuantityState[1] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price3 - EndIf - If CustomCoffeeQuantityState[2] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price4 - EndIf - - If CustomCoffeeLevelState[0] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + toppingID9price1 - EndIf - If CustomCoffeeLevelState[1] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + toppingID9price2 - EndIf - If CustomCoffeeLevelState[2] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + toppingID9price3 - EndIf - If CustomCoffeeLevelState[3] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + toppingID9price4 - EndIf - - EndIf - - - DEBUGVAR SelectDrinkType - - DEBUGVAR showShotEnable - DEBUGVAR PriceDrinkTmpShow - - - Var PriceDrinkTmp = PriceDrinkNoTop + TOPPING_PRICE - Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp - - - If SelectDrinkType = 0 Then - Var PriceDrinkTmpShow = "---" - Else - Var PriceDrinkTmpShow !assigned StringFmt( PriceDrinkTmp , DisplayFormat, PreScaleConvertShow) - EndIf - SAVELOG PriceDrinkTmp - - If RoadShow = "true" Then - - Var PriceDrinkTmpShow = "Free" - - DEBUGVAR SelectDrink2 - DEBUGVAR PriceDrinkTmpShow - EndIf - - - ; echo -n true > /mnt/sdcard/coffeevending/menu_blend_free - - READ_FILE "/mnt/sdcard/coffeevending/menu_blend_free" menu_blend_free - DEBUGVAR menu_blend_free - DEBUGVAR blend_button_state - - If menu_blend_free = "true" Then - If blend_button_state = "PressForever" Then - Var PriceDrinkNoTop = 0 - Var PriceDrinkTmpShow = "Free" - EndIf - EndIf - - If SugarZeroCalCheck = "PressForever" Then - If SugarNormalCheck = "PressForever" Then - Var SugarZeroCalCheck = "Enable" - EndIf - EndIf - - If SelectDrinkType = 0 Then - If ENABLE_LANGUAGE_COUNT > 2 Then - Var showname = aliasName[LanguageShowByIndex] - Var showdesc = aliasName[LanguageShowByIndex] - Else - If show_eng = "true" Then - Var showname = NameDrink - Var showdesc = DrinkDescription - Else - Var showname = NameDrinkTH - Var showdesc = DrinkDescriptionTH - EndIf - EndIf - EndIf - - - - BackslashNToEnter showname - BackslashNToEnter showdesc - CRLFToSpace showname - CRLFToSpace showdesc - DEBUGVAR showname - DEBUGVAR showdesc - - Strlen showname show_name_len - - Var hasPress = "false" - - If CustomOreoState = "Enable" Then - If CustomOreoCheckState = "Press" Then - Var hasPress = "true" - EndIf - EndIf - - If CustomOvaltineState = "Enable" Then - If CustomOvaltineCheckState = "Press" Then - Var hasPress = "true" - EndIf - EndIf - - If CustomCocoaState = "Enable" Then - If CustomCocoaCheckState = "Press" Then - Var hasPress = "true" - EndIf - EndIf - - If hasPress = "true" Then - Var PopupToppingSelect = "Press" - If show_eng = "true" Then - Var bnAccept = "ROOT/taobin_project/image/topping2_en/topping_revamp/bn_accept.png" - Var bpAccept = "ROOT/taobin_project/image/topping2_en/topping_revamp/bp_accept.png" - Else - Var bnAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bn_accept.png" - Var bpAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bp_accept.png" - EndIf - If LanguageShow = "MYANMAR" Then - Var bnAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bn_accept2.png" - Var bpAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bp_accept2.png" - EndIf - If LanguageShow = "MSC" Then - Var bnAccept = "ROOT/taobin_project/image/topping_revamp_msc/bn_accept2.png" - Var bpAccept = "ROOT/taobin_project/image/topping_revamp_msc/bp_accept2.png" - EndIf - Var bnAcceptX = 445 - Else - Var PopupToppingSelect = "Enable" - If show_eng = "true" Then - Var bnAccept = "ROOT/taobin_project/image/topping2_en/topping_revamp/bn_accept2.png" - Var bpAccept = "ROOT/taobin_project/image/topping2_en/topping_revamp/bp_accept2.png" - Else - Var bnAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bn_accept2.png" - Var bpAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bp_accept2.png" - EndIf - If LanguageShow = "MYANMAR" Then - Var bnAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bn_accept2.png" - Var bpAccept = "ROOT/taobin_project/image/topping_revamp_mmr/bp_accept2.png" - EndIf - If LanguageShow = "MSC" Then - Var bnAccept = "ROOT/taobin_project/image/topping_revamp_msc/bn_accept2.png" - Var bpAccept = "ROOT/taobin_project/image/topping_revamp_msc/bp_accept2.png" - EndIf - Var bnAcceptX = 360 - EndIf - - - Var Timeout = 0 - - RefreshAll diff --git a/xml_main/startup.xml b/xml_main/startup.xml index cf5fd020..ccc9c77d 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "10.04" - Var XMLPageVersionInt = 1004 + Var XMLPageVersion = "10.05" + Var XMLPageVersionInt = 1005 Var CurrentMainVideo = 2 diff --git a/xml_main/startup_dev.xml b/xml_main/startup_dev.xml index 24b6fdf4..1f488bc2 100644 --- a/xml_main/startup_dev.xml +++ b/xml_main/startup_dev.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "11.04" - Var XMLPageVersionInt = 1104 + Var XMLPageVersion = "11.05" + Var XMLPageVersionInt = 1105 ;Oreo Var OreoGuarantee = 0