diff --git a/inter/gbr/image/page_drink_disable_n2/bn_protein_Mocha.png b/inter/gbr/image/page_drink_disable_n2/bn_protein_Mocha.png index 58328ccb..262d13ee 100644 Binary files a/inter/gbr/image/page_drink_disable_n2/bn_protein_Mocha.png and b/inter/gbr/image/page_drink_disable_n2/bn_protein_Mocha.png differ diff --git a/inter/gbr/image/page_drink_n/bn_protein_Mocha.png b/inter/gbr/image/page_drink_n/bn_protein_Mocha.png index 9bb45145..9fad6b51 100644 Binary files a/inter/gbr/image/page_drink_n/bn_protein_Mocha.png and b/inter/gbr/image/page_drink_n/bn_protein_Mocha.png differ diff --git a/inter/gbr/image/page_drink_picture2_n/bn_protein_Mocha.png b/inter/gbr/image/page_drink_picture2_n/bn_protein_Mocha.png index 553f532c..aeff1756 100644 Binary files a/inter/gbr/image/page_drink_picture2_n/bn_protein_Mocha.png and b/inter/gbr/image/page_drink_picture2_n/bn_protein_Mocha.png differ diff --git a/inter/gbr/image/page_drink_press_n/bn_protein_Mocha.png b/inter/gbr/image/page_drink_press_n/bn_protein_Mocha.png index ada4a351..c67d5a41 100644 Binary files a/inter/gbr/image/page_drink_press_n/bn_protein_Mocha.png and b/inter/gbr/image/page_drink_press_n/bn_protein_Mocha.png differ diff --git a/inter/gbr/xml/page_catalog_group_recommend.lxml b/inter/gbr/xml/page_catalog_group_recommend.lxml index 45585a3f..95721392 100644 --- a/inter/gbr/xml/page_catalog_group_recommend.lxml +++ b/inter/gbr/xml/page_catalog_group_recommend.lxml @@ -4962,6 +4962,276 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - 55-05-02-0022 - + + 33 + 22 + 225 + 296 + Flag( 55-05-02-0022.Button,Disable=Invisible,$Sum5505020022) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + LYCHEE SPARKLING\nLIMENADE + ลิ้นจี่มะนาวโซดา + LYCHEE SPARKLING\nLIMENADE + ลิ้นจี่มะนาวโซดา + + ลิ้นจี่มะนาวโซดา + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Strawberry Syrup,\nLimenade, Soda & Ice + น้ำเชื่อมสตอเบอร์รี่ มะนาว \nโซดา + Strawberry Syrup,\nLimenade, Soda & Ice + น้ำเชื่อมสตอเบอร์รี่ มะนาว \nโซดา + + น้ำเชื่อมสตอเบอร์รี่ มะนาว \nโซดา + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $55-05-02-0022.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $55-05-02-0022.Button + StringFmt( $55-05-02-0022.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.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 $Sum5505020022 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $55-05-02-0022.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.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 + "disable-show" + $Sum5505020022 + + 000013 + + center-vertical-horizontal + ; ==================> Len = 3 ; - 55-05-02-0041 - diff --git a/inter/gbr/xml/page_catalog_group_recommend_multi_pro.lxml b/inter/gbr/xml/page_catalog_group_recommend_multi_pro.lxml index 5162969e..c9f4b040 100644 --- a/inter/gbr/xml/page_catalog_group_recommend_multi_pro.lxml +++ b/inter/gbr/xml/page_catalog_group_recommend_multi_pro.lxml @@ -4937,6 +4937,276 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; - 55-05-02-0022 - + + 33 + 22 + 225 + 296 + Flag( 55-05-02-0022.Button,$Sum5505020022) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + LYCHEE SPARKLING\nLIMENADE + ลิ้นจี่มะนาวโซดา + LYCHEE SPARKLING\nLIMENADE + ลิ้นจี่มะนาวโซดา + + ลิ้นจี่มะนาวโซดา + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Strawberry Syrup,\nLimenade, Soda & Ice + น้ำเชื่อมสตอเบอร์รี่ มะนาว \nโซดา + Strawberry Syrup,\nLimenade, Soda & Ice + น้ำเชื่อมสตอเบอร์รี่ มะนาว \nโซดา + + น้ำเชื่อมสตอเบอร์รี่ มะนาว \nโซดา + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $55-05-02-0022.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $55-05-02-0022.Button + StringFmt( $55-05-02-0022.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.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 $Sum5505020022 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $55-05-02-0022.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.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 + "disable-show" + $Sum5505020022 + + 000013 + + center-vertical-horizontal + ; ==================> Len = 3 ; - 55-05-02-0041 - diff --git a/xml_main/startup.xml b/xml_main/startup.xml index a4150768..00677486 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,9 +108,9 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "9.99" - Var XMLPageVersionInt = 999 - + Var XMLPageVersion = "10.01" + Var XMLPageVersionInt = 1001 + Var CurrentMainVideo = 2