diff --git a/image/event/powerup_free_1/bn_iced_energy_drink.png b/image/event/powerup_free_1/bn_iced_energy_drink.png new file mode 100644 index 00000000..eff77fa1 Binary files /dev/null and b/image/event/powerup_free_1/bn_iced_energy_drink.png differ diff --git a/image/event/powerup_free_1/bn_iced_energy_drink_soda.png b/image/event/powerup_free_1/bn_iced_energy_drink_soda.png new file mode 100644 index 00000000..c3dc2451 Binary files /dev/null and b/image/event/powerup_free_1/bn_iced_energy_drink_soda.png differ diff --git a/image/event/powerup_free_1/powerup_policy.png b/image/event/powerup_free_1/powerup_policy.png index fe96d34f..c5788380 100644 Binary files a/image/event/powerup_free_1/powerup_policy.png and b/image/event/powerup_free_1/powerup_policy.png differ diff --git a/image/event/powerup_free_1/powerup_policy_en.png b/image/event/powerup_free_1/powerup_policy_en.png index 7b828fe5..194af0f3 100644 Binary files a/image/event/powerup_free_1/powerup_policy_en.png and b/image/event/powerup_free_1/powerup_policy_en.png differ diff --git a/image/event/powerup_free_1/text1.png b/image/event/powerup_free_1/text1.png new file mode 100644 index 00000000..8ca96bea Binary files /dev/null and b/image/event/powerup_free_1/text1.png differ diff --git a/xml/event/powerup_free_1/page_powerup_catalog.xml b/xml/event/powerup_free_1/page_powerup_catalog.xml index b1a284e3..7c81bd6a 100644 --- a/xml/event/powerup_free_1/page_powerup_catalog.xml +++ b/xml/event/powerup_free_1/page_powerup_catalog.xml @@ -281,7 +281,7 @@ Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" EndIf @@ -523,9 +523,17 @@ EndIf + + ; welcome + + 400 + 300 + <> + + - 2 - 10 + 16 + 99 497 1080 "auto" @@ -541,14 +549,14 @@ 33 22 - 225 - 296 + 410 + 540 Flag( 12-05-02-0034.Button,12-05-03-0034.Button,$Sum12050200341205030034) - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "เต่าทรงพลัง" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "เครื่องดื่มเต่าทรงพลัง - (มีคาเฟอีน)" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "TAO POWER DRINK" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Medicine drink & Ice" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-05-02-0034.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-05-02-0034.Button - StringFmt( $12-05-02-0034.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-05-03-0034.Button - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-05-03-0034.Button - StringFmt( $12-05-03-0034.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum12050200341205030034 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $12-05-02-0034.TAG tag2_is_disable - STRCONTAIN "ERR" $12-05-03-0034.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum12050200341205030034 - text_unavailable - center-vertical-horizontal - @@ -798,14 +638,14 @@ 33 22 - 225 - 296 + 410 + 540 Flag( 12-05-02-0035.Button,12-05-03-0035.Button,$Sum12050200351205030035) - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "เต่าทรงพลังโซดา" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "เครื่องดื่มเต่าทรงพลัง โซดา - (มีคาเฟอีน)" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "TAO POWER - DRINK SODA" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Medicine drink, Soda & Ice" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-05-02-0035.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-05-02-0035.Button - StringFmt( $12-05-02-0035.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-05-03-0035.Button - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-05-03-0035.Button - StringFmt( $12-05-03-0035.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum12050200351205030035 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $12-05-02-0035.TAG tag2_is_disable - STRCONTAIN "ERR" $12-05-03-0035.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum12050200351205030035 - text_unavailable - center-vertical-horizontal - + ; Cart diff --git a/xml/event/powerup_free_1/page_powerup_consent.xml b/xml/event/powerup_free_1/page_powerup_consent.xml index 380f7fd5..e048859b 100644 --- a/xml/event/powerup_free_1/page_powerup_consent.xml +++ b/xml/event/powerup_free_1/page_powerup_consent.xml @@ -180,7 +180,7 @@ Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.xml" + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" EndIf diff --git a/xml/event/powerup_free_1/page_powerup_identity.xml b/xml/event/powerup_free_1/page_powerup_identity.xml index e1760759..4a9da436 100644 --- a/xml/event/powerup_free_1/page_powerup_identity.xml +++ b/xml/event/powerup_free_1/page_powerup_identity.xml @@ -336,7 +336,7 @@ SoundVolume - Open "ROOT/taobin_project/xml/page_catalog2.xml" + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 7317046e..c25c9ace 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -339,7 +339,7 @@ If FromPowerUpPro = 1 Then If FreeEnergyDrink = 1 Then - If SelectDrink = "" Then + If SelectDrink = "12-05-02-0035" Then Var PriceDiff = PriceDrink - 1 Var Seeker.VendingCode = "FIX1" Var Seeker.IntVendingCampaign = PriceDiff @@ -348,6 +348,17 @@ Var Seeker.CodeNumber = IDNum Var Seeker.VendingCampaignRI3 = PriceDiff Var Seeker.CampaignPPrice = 1 + Else + If SelectDrink = "" Then + Var PriceDiff = PriceDrink - 1 + Var Seeker.VendingCode = "FIX1" + Var Seeker.IntVendingCampaign = PriceDiff + Var Seeker.FreeVendingCampaign = 0 + Var Seeker.CodeChannel = 1 + Var Seeker.CodeNumber = IDNum + Var Seeker.VendingCampaignRI3 = PriceDiff + Var Seeker.CampaignPPrice = 1 + EndIf EndIf EndIf