diff --git a/image/collectiing_en/bd_confirm.png b/image/collectiing_en/bd_confirm.png new file mode 100644 index 00000000..61a67e45 Binary files /dev/null and b/image/collectiing_en/bd_confirm.png differ diff --git a/xml/event/promotion_lipit.xml b/xml/event/promotion_lipit.xml index 45be3c63..0c209ce7 100644 --- a/xml/event/promotion_lipit.xml +++ b/xml/event/promotion_lipit.xml @@ -2083,6 +2083,261 @@ VOLCANO" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 17 + ; 12-03-01-0002 12-03-02-0002 12-03-03-0002 + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0002.Button,12-03-02-0002.Button,12-03-03-0002.Button,Disable=Invisible,$Sum120301000212030200021203030002) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "โกโก้ " + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โกโก้ นมและน้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "COCOA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Milk, Cocoa, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0002.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0002.Button + StringFmt( $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0002.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0002.Button + StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0002.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0002.Button + StringFmt( $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120301000212030200021203030002 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum120301000212030200021203030002 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0002.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0002.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0002.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" + $Sum120301000212030200021203030002 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 @@ -2594,261 +2849,6 @@ BANANA MILK" text_unavailable center-vertical-horizontal - - ; - - - - ; ==================> Len = 17 - ; 12-03-01-0002 12-03-02-0002 12-03-03-0002 - - 33 - 22 - 225 - 296 - Flag( 12-03-01-0002.Button,12-03-02-0002.Button,12-03-03-0002.Button,Disable=Invisible,$Sum120301000212030200021203030002) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "โกโก้ " - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "โกโก้ นมและน้ำตาล" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "COCOA" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Milk, Cocoa, Sugar" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-03-01-0002.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-01-0002.Button - StringFmt( $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-03-02-0002.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-02-0002.Button - StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-03-03-0002.Button - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-03-0002.Button - StringFmt( $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum120301000212030200021203030002 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - 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 $Sum120301000212030200021203030002 = "Disable" Then - STRCONTAIN "ERR" $12-03-01-0002.TAG tag1_is_disable - STRCONTAIN "ERR" $12-03-02-0002.TAG tag2_is_disable - STRCONTAIN "ERR" $12-03-03-0002.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" - $Sum120301000212030200021203030002 - text_unavailable - center-vertical-horizontal - ; - - - ; ==================> Len = 12 @@ -11293,20 +11293,7 @@ LIMENADE SODA" - + @@ -11398,5 +11385,20 @@ LIMENADE SODA" + + diff --git a/xml/event/promotion_monday_banana.xml b/xml/event/promotion_monday_banana.xml index f69247ee..1357555f 100644 --- a/xml/event/promotion_monday_banana.xml +++ b/xml/event/promotion_monday_banana.xml @@ -2083,6 +2083,261 @@ VOLCANO" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 17 + ; 12-03-01-0002 12-03-02-0002 12-03-03-0002 + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0002.Button,12-03-02-0002.Button,12-03-03-0002.Button,Disable=Invisible,$Sum120301000212030200021203030002) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "โกโก้ " + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โกโก้ นมและน้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "COCOA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Milk, Cocoa, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0002.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0002.Button + StringFmt( $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0002.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0002.Button + StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0002.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0002.Button + StringFmt( $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120301000212030200021203030002 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum120301000212030200021203030002 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0002.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0002.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0002.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" + $Sum120301000212030200021203030002 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 @@ -2594,261 +2849,6 @@ BANANA MILK" text_unavailable center-vertical-horizontal - - ; - - - - ; ==================> Len = 17 - ; 12-03-01-0002 12-03-02-0002 12-03-03-0002 - - 33 - 22 - 225 - 296 - Flag( 12-03-01-0002.Button,12-03-02-0002.Button,12-03-03-0002.Button,Disable=Invisible,$Sum120301000212030200021203030002) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "โกโก้ " - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "โกโก้ นมและน้ำตาล" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "COCOA" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Milk, Cocoa, Sugar" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-03-01-0002.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-01-0002.Button - StringFmt( $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-03-02-0002.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-02-0002.Button - StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-03-03-0002.Button - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-03-0002.Button - StringFmt( $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum120301000212030200021203030002 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - 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 $Sum120301000212030200021203030002 = "Disable" Then - STRCONTAIN "ERR" $12-03-01-0002.TAG tag1_is_disable - STRCONTAIN "ERR" $12-03-02-0002.TAG tag2_is_disable - STRCONTAIN "ERR" $12-03-03-0002.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" - $Sum120301000212030200021203030002 - text_unavailable - center-vertical-horizontal - ; - - - ; ==================> Len = 12 @@ -11293,20 +11293,7 @@ LIMENADE SODA" - + @@ -11362,5 +11349,20 @@ LIMENADE SODA" + + diff --git a/xml/event/promotion_pepsi_second_cup_30.xml b/xml/event/promotion_pepsi_second_cup_30.xml index cd219597..a8e1753e 100644 --- a/xml/event/promotion_pepsi_second_cup_30.xml +++ b/xml/event/promotion_pepsi_second_cup_30.xml @@ -2083,6 +2083,261 @@ VOLCANO" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 17 + ; 12-03-01-0002 12-03-02-0002 12-03-03-0002 + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0002.Button,12-03-02-0002.Button,12-03-03-0002.Button,Disable=Invisible,$Sum120301000212030200021203030002) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "โกโก้ " + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โกโก้ นมและน้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "COCOA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Milk, Cocoa, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0002.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0002.Button + StringFmt( $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0002.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0002.Button + StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0002.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0002.Button + StringFmt( $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120301000212030200021203030002 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum120301000212030200021203030002 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0002.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0002.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0002.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" + $Sum120301000212030200021203030002 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 @@ -2594,261 +2849,6 @@ BANANA MILK" text_unavailable center-vertical-horizontal - - ; - - - - ; ==================> Len = 17 - ; 12-03-01-0002 12-03-02-0002 12-03-03-0002 - - 33 - 22 - 225 - 296 - Flag( 12-03-01-0002.Button,12-03-02-0002.Button,12-03-03-0002.Button,Disable=Invisible,$Sum120301000212030200021203030002) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "โกโก้ " - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "โกโก้ นมและน้ำตาล" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "COCOA" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Milk, Cocoa, Sugar" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-03-01-0002.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-01-0002.Button - StringFmt( $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-03-02-0002.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-02-0002.Button - StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-03-03-0002.Button - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-03-0002.Button - StringFmt( $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum120301000212030200021203030002 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - 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 $Sum120301000212030200021203030002 = "Disable" Then - STRCONTAIN "ERR" $12-03-01-0002.TAG tag1_is_disable - STRCONTAIN "ERR" $12-03-02-0002.TAG tag2_is_disable - STRCONTAIN "ERR" $12-03-03-0002.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" - $Sum120301000212030200021203030002 - text_unavailable - center-vertical-horizontal - ; - - - ; ==================> Len = 12 @@ -11293,20 +11293,7 @@ LIMENADE SODA" - + @@ -11398,5 +11385,20 @@ LIMENADE SODA" + + diff --git a/xml/event/promotion_powerup_free_1.xml b/xml/event/promotion_powerup_free_1.xml index ffd5a158..a397bbd1 100644 --- a/xml/event/promotion_powerup_free_1.xml +++ b/xml/event/promotion_powerup_free_1.xml @@ -2083,6 +2083,261 @@ VOLCANO" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 17 + ; 12-03-01-0002 12-03-02-0002 12-03-03-0002 + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0002.Button,12-03-02-0002.Button,12-03-03-0002.Button,Disable=Invisible,$Sum120301000212030200021203030002) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "โกโก้ " + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โกโก้ นมและน้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "COCOA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Milk, Cocoa, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0002.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0002.Button + StringFmt( $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0002.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0002.Button + StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0002.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0002.Button + StringFmt( $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120301000212030200021203030002 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum120301000212030200021203030002 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0002.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0002.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0002.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" + $Sum120301000212030200021203030002 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 @@ -2594,261 +2849,6 @@ BANANA MILK" text_unavailable center-vertical-horizontal - - ; - - - - ; ==================> Len = 17 - ; 12-03-01-0002 12-03-02-0002 12-03-03-0002 - - 33 - 22 - 225 - 296 - Flag( 12-03-01-0002.Button,12-03-02-0002.Button,12-03-03-0002.Button,Disable=Invisible,$Sum120301000212030200021203030002) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "โกโก้ " - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "โกโก้ นมและน้ำตาล" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "COCOA" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Milk, Cocoa, Sugar" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-03-01-0002.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-01-0002.Button - StringFmt( $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-03-02-0002.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-02-0002.Button - StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-03-03-0002.Button - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-03-0002.Button - StringFmt( $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum120301000212030200021203030002 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - 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 $Sum120301000212030200021203030002 = "Disable" Then - STRCONTAIN "ERR" $12-03-01-0002.TAG tag1_is_disable - STRCONTAIN "ERR" $12-03-02-0002.TAG tag2_is_disable - STRCONTAIN "ERR" $12-03-03-0002.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" - $Sum120301000212030200021203030002 - text_unavailable - center-vertical-horizontal - ; - - - ; ==================> Len = 12 @@ -11293,20 +11293,7 @@ LIMENADE SODA" - + @@ -11359,5 +11346,20 @@ LIMENADE SODA" Refresh + + diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 84abd8f8..e4a9fcf4 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -244,15 +244,9 @@ If BoxID = 201316 Then Var NewFlowPaymentCode = 1 EndIf -; If BoxID = 105005 Then -; Var PepsiSecondCup30Enable = 1 -; Var PepsiSecondCup30DiscountEnable = 1 -; Var NewFlowPaymentCode = 1 -; -; Var LipitPro = 0 -; Var MondayBananaPro = 1 -; Var FreeEnergyDrink = 0 -; EndIf +If BoxID = 105005 Then + Var NewFlowPaymentCode = 1 +EndIf If BoxID = 172644 Then Var ProPeachEnable = 1 diff --git a/xml/event/triple_promotion_lipit_and_monday_banana_and_free_energy_drink.xml b/xml/event/triple_promotion_lipit_and_monday_banana_and_free_energy_drink.xml index a5f577de..d2c091ae 100644 --- a/xml/event/triple_promotion_lipit_and_monday_banana_and_free_energy_drink.xml +++ b/xml/event/triple_promotion_lipit_and_monday_banana_and_free_energy_drink.xml @@ -4260,6 +4260,261 @@ VOLCANO" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 17 + ; 12-03-01-0002 12-03-02-0002 12-03-03-0002 + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0002.Button,12-03-02-0002.Button,12-03-03-0002.Button,Disable=Invisible,$Sum120301000212030200021203030002) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "โกโก้ " + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โกโก้ นมและน้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "COCOA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Milk, Cocoa, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0002.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0002.Button + StringFmt( $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0002.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0002.Button + StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0002.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0002.Button + StringFmt( $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120301000212030200021203030002 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum120301000212030200021203030002 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0002.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0002.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0002.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" + $Sum120301000212030200021203030002 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 @@ -4771,261 +5026,6 @@ BANANA MILK" text_unavailable center-vertical-horizontal - - ; - - - - ; ==================> Len = 17 - ; 12-03-01-0002 12-03-02-0002 12-03-03-0002 - - 33 - 22 - 225 - 296 - Flag( 12-03-01-0002.Button,12-03-02-0002.Button,12-03-03-0002.Button,Disable=Invisible,$Sum120301000212030200021203030002) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "โกโก้ " - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "โกโก้ นมและน้ำตาล" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "COCOA" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Milk, Cocoa, Sugar" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-03-01-0002.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-01-0002.Button - StringFmt( $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-03-02-0002.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-02-0002.Button - StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-03-03-0002.Button - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-03-0002.Button - StringFmt( $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum120301000212030200021203030002 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - 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 $Sum120301000212030200021203030002 = "Disable" Then - STRCONTAIN "ERR" $12-03-01-0002.TAG tag1_is_disable - STRCONTAIN "ERR" $12-03-02-0002.TAG tag2_is_disable - STRCONTAIN "ERR" $12-03-03-0002.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" - $Sum120301000212030200021203030002 - text_unavailable - center-vertical-horizontal - ; - - - ; ==================> Len = 12 @@ -13470,20 +13470,7 @@ LIMENADE SODA" - + @@ -13652,5 +13639,20 @@ LIMENADE SODA" + + diff --git a/xml/event/triple_promotion_pepsi_second_cup_30_and_monday_banana_and_free_energy_drink.xml b/xml/event/triple_promotion_pepsi_second_cup_30_and_monday_banana_and_free_energy_drink.xml index f062e79a..3c22cc57 100644 --- a/xml/event/triple_promotion_pepsi_second_cup_30_and_monday_banana_and_free_energy_drink.xml +++ b/xml/event/triple_promotion_pepsi_second_cup_30_and_monday_banana_and_free_energy_drink.xml @@ -4260,6 +4260,261 @@ VOLCANO" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 17 + ; 12-03-01-0002 12-03-02-0002 12-03-03-0002 + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0002.Button,12-03-02-0002.Button,12-03-03-0002.Button,Disable=Invisible,$Sum120301000212030200021203030002) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "โกโก้ " + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โกโก้ นมและน้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "COCOA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Milk, Cocoa, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0002.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0002.Button + StringFmt( $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0002.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0002.Button + StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0002.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0002.Button + StringFmt( $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120301000212030200021203030002 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum120301000212030200021203030002 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0002.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0002.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0002.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" + $Sum120301000212030200021203030002 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 @@ -4771,261 +5026,6 @@ BANANA MILK" text_unavailable center-vertical-horizontal - - ; - - - - ; ==================> Len = 17 - ; 12-03-01-0002 12-03-02-0002 12-03-03-0002 - - 33 - 22 - 225 - 296 - Flag( 12-03-01-0002.Button,12-03-02-0002.Button,12-03-03-0002.Button,Disable=Invisible,$Sum120301000212030200021203030002) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "โกโก้ " - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "โกโก้ นมและน้ำตาล" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "COCOA" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Milk, Cocoa, Sugar" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-03-01-0002.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-01-0002.Button - StringFmt( $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-03-02-0002.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-02-0002.Button - StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-03-03-0002.Button - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-03-0002.Button - StringFmt( $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum120301000212030200021203030002 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - 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 $Sum120301000212030200021203030002 = "Disable" Then - STRCONTAIN "ERR" $12-03-01-0002.TAG tag1_is_disable - STRCONTAIN "ERR" $12-03-02-0002.TAG tag2_is_disable - STRCONTAIN "ERR" $12-03-03-0002.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" - $Sum120301000212030200021203030002 - text_unavailable - center-vertical-horizontal - ; - - - ; ==================> Len = 12 @@ -13470,20 +13470,7 @@ LIMENADE SODA" - + @@ -13652,5 +13639,20 @@ LIMENADE SODA" + + diff --git a/xml/page_catalog_group_recommend.skt b/xml/page_catalog_group_recommend.skt index 14b870ee..bd79b4e1 100644 --- a/xml/page_catalog_group_recommend.skt +++ b/xml/page_catalog_group_recommend.skt @@ -59,6 +59,12 @@ #include=menu_new_layout_gen.py ?> + + + + +;BigLogoLayout + - - -;BigLogoLayout - diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index 1bc8b30b..99e0e60d 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -1104,6 +1104,261 @@ VOLCANO" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 17 + ; 12-03-01-0002 12-03-02-0002 12-03-03-0002 + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0002.Button,12-03-02-0002.Button,12-03-03-0002.Button,Disable=Invisible,$Sum120301000212030200021203030002) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "โกโก้ " + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โกโก้ นมและน้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "COCOA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Milk, Cocoa, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0002.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0002.Button + StringFmt( $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0002.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0002.Button + StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0002.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0002.Button + StringFmt( $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120301000212030200021203030002 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum120301000212030200021203030002 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0002.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0002.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0002.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" + $Sum120301000212030200021203030002 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 @@ -1615,261 +1870,6 @@ BANANA MILK" text_unavailable center-vertical-horizontal - - ; - - - - ; ==================> Len = 17 - ; 12-03-01-0002 12-03-02-0002 12-03-03-0002 - - 33 - 22 - 225 - 296 - Flag( 12-03-01-0002.Button,12-03-02-0002.Button,12-03-03-0002.Button,Disable=Invisible,$Sum120301000212030200021203030002) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "โกโก้ " - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "โกโก้ นมและน้ำตาล" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "COCOA" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Milk, Cocoa, Sugar" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-03-01-0002.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-01-0002.Button - StringFmt( $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-03-02-0002.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-02-0002.Button - StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-03-03-0002.Button - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-03-0002.Button - StringFmt( $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum120301000212030200021203030002 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - 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 $Sum120301000212030200021203030002 = "Disable" Then - STRCONTAIN "ERR" $12-03-01-0002.TAG tag1_is_disable - STRCONTAIN "ERR" $12-03-02-0002.TAG tag2_is_disable - STRCONTAIN "ERR" $12-03-03-0002.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" - $Sum120301000212030200021203030002 - text_unavailable - center-vertical-horizontal - ; - - - ; ==================> Len = 12 @@ -10314,6 +10314,12 @@ LIMENADE SODA" + + + + +;BigLogoLayout + - - -;BigLogoLayout - diff --git a/xml/page_catalog_group_recommend_double_pro.skt b/xml/page_catalog_group_recommend_double_pro.skt index 14b870ee..525af73d 100644 --- a/xml/page_catalog_group_recommend_double_pro.skt +++ b/xml/page_catalog_group_recommend_double_pro.skt @@ -59,6 +59,10 @@ #include=menu_new_layout_gen.py ?> + + +;BigLogoLayout + - - -;BigLogoLayout - diff --git a/xml/page_catalog_group_recommend_triple_pro.skt b/xml/page_catalog_group_recommend_triple_pro.skt index 14b870ee..bd79b4e1 100644 --- a/xml/page_catalog_group_recommend_triple_pro.skt +++ b/xml/page_catalog_group_recommend_triple_pro.skt @@ -59,6 +59,12 @@ #include=menu_new_layout_gen.py ?> + + + + +;BigLogoLayout + - - -;BigLogoLayout - diff --git a/xml/page_catalog_group_recommend_triple_pro.xml b/xml/page_catalog_group_recommend_triple_pro.xml index 771b6138..5b03e30e 100644 --- a/xml/page_catalog_group_recommend_triple_pro.xml +++ b/xml/page_catalog_group_recommend_triple_pro.xml @@ -1069,6 +1069,261 @@ VOLCANO" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 17 + ; 12-03-01-0002 12-03-02-0002 12-03-03-0002 + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0002.Button,12-03-02-0002.Button,12-03-03-0002.Button,Disable=Invisible,$Sum120301000212030200021203030002) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "โกโก้ " + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โกโก้ นมและน้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "COCOA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Milk, Cocoa, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0002.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0002.Button + StringFmt( $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0002.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0002.Button + StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0002.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0002.Button + StringFmt( $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120301000212030200021203030002 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum120301000212030200021203030002 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0002.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0002.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0002.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" + $Sum120301000212030200021203030002 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 @@ -1580,261 +1835,6 @@ BANANA MILK" text_unavailable center-vertical-horizontal - - ; - - - - ; ==================> Len = 17 - ; 12-03-01-0002 12-03-02-0002 12-03-03-0002 - - 33 - 22 - 225 - 296 - Flag( 12-03-01-0002.Button,12-03-02-0002.Button,12-03-03-0002.Button,Disable=Invisible,$Sum120301000212030200021203030002) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "โกโก้ " - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "โกโก้ นมและน้ำตาล" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "COCOA" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Milk, Cocoa, Sugar" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-03-01-0002.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-01-0002.Button - StringFmt( $12-03-01-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-03-02-0002.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-02-0002.Button - StringFmt( $12-03-02-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-03-03-0002.Button - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-03-0002.Button - StringFmt( $12-03-03-0002.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum120301000212030200021203030002 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - 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 $Sum120301000212030200021203030002 = "Disable" Then - STRCONTAIN "ERR" $12-03-01-0002.TAG tag1_is_disable - STRCONTAIN "ERR" $12-03-02-0002.TAG tag2_is_disable - STRCONTAIN "ERR" $12-03-03-0002.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" - $Sum120301000212030200021203030002 - text_unavailable - center-vertical-horizontal - ; - - - ; ==================> Len = 12 @@ -10279,6 +10279,12 @@ LIMENADE SODA" + + + + +;BigLogoLayout + - - -;BigLogoLayout - diff --git a/xml/page_payment_credit3-0.xml b/xml/page_payment_credit3-0.xml index dae28976..663b829d 100644 --- a/xml/page_payment_credit3-0.xml +++ b/xml/page_payment_credit3-0.xml @@ -11,6 +11,7 @@ ; On open Var Timeout = 0 + Var ReqTimeout = 0 If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/collectiing_en" @@ -39,6 +40,8 @@ Var Seeker.TNumberTaobinCredit = TelephoneNumber Var Seeker.CoffeePinNumber = PinNumber + Var UseCreditState = "Enable" + Var LOADING_REQ_ADDDATA22_STATE = "Invisible" 1000 @@ -57,6 +60,20 @@ Open "ROOT/taobin_project/xml/page_payment_cash.xml" EndIf EndIf + + If ReqAdddata22 = 1 Then + Var ReqTimeout = ReqTimeout + 1 + If ReqTimeout = 15 Then + SAVELOG "Error ReqAdddata22 timeout." + + Var ShowErrorText = "Enable" + If ReqAdddata22 = 1 Then + Var ReqAdddata22 = 0 + Var UseCreditState = "Enable" + Var LOADING_REQ_ADDDATA22_STATE = "Invisible" + EndIf + EndIf + EndIf Refresh @@ -113,10 +130,11 @@ - Var ShowErrorText = "Enable" - Refresh + Var ShowErrorText = "Enable" + Var UseCreditState = "Enable" + Refresh - If ReqAdddata22 = 1 Then + If ReqAdddata22 = 1 Then Var ReqAdddata22 = 0 EndIf @@ -185,24 +203,40 @@ + + 508 + 1080 + 45 + 45 + LOADING_REQ_ADDDATA22_STATE + "ROOT/taobin_project/image/page_payment/loading.gif" + +