diff --git a/image/event/mom_cocoa/mom_cocoa_banner_13-31.png b/image/event/mom_cocoa/mom_cocoa_banner_13-31.png index d008c6b6..914c7378 100644 Binary files a/image/event/mom_cocoa/mom_cocoa_banner_13-31.png and b/image/event/mom_cocoa/mom_cocoa_banner_13-31.png differ diff --git a/image/page_drink_disable_n2/IcedCocoax2.png b/image/page_drink_disable_n2/IcedCocoax2.png new file mode 100644 index 00000000..597b57b8 Binary files /dev/null and b/image/page_drink_disable_n2/IcedCocoax2.png differ diff --git a/image/page_drink_disable_n2/IcedCocoax3.png b/image/page_drink_disable_n2/IcedCocoax3.png new file mode 100644 index 00000000..022ea42b Binary files /dev/null and b/image/page_drink_disable_n2/IcedCocoax3.png differ diff --git a/image/page_drink_n/IcedCocoax2.png b/image/page_drink_n/IcedCocoax2.png new file mode 100644 index 00000000..5512c529 Binary files /dev/null and b/image/page_drink_n/IcedCocoax2.png differ diff --git a/image/page_drink_n/IcedCocoax3.png b/image/page_drink_n/IcedCocoax3.png new file mode 100644 index 00000000..46c86d03 Binary files /dev/null and b/image/page_drink_n/IcedCocoax3.png differ diff --git a/image/page_drink_picture2_n/IcedCocoax2.png b/image/page_drink_picture2_n/IcedCocoax2.png new file mode 100644 index 00000000..d0085af8 Binary files /dev/null and b/image/page_drink_picture2_n/IcedCocoax2.png differ diff --git a/image/page_drink_picture2_n/IcedCocoax3.png b/image/page_drink_picture2_n/IcedCocoax3.png new file mode 100644 index 00000000..d6bf729c Binary files /dev/null and b/image/page_drink_picture2_n/IcedCocoax3.png differ diff --git a/image/page_drink_press_n/IcedCocoax2.png b/image/page_drink_press_n/IcedCocoax2.png new file mode 100644 index 00000000..5e4c7222 Binary files /dev/null and b/image/page_drink_press_n/IcedCocoax2.png differ diff --git a/image/page_drink_press_n/IcedCocoax3.png b/image/page_drink_press_n/IcedCocoax3.png new file mode 100644 index 00000000..18ea81ad Binary files /dev/null and b/image/page_drink_press_n/IcedCocoax3.png differ diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 36098868..307a4a78 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -252,6 +252,11 @@ If SystemDateMonthInt = 8 Then EndIf If SystemDateMonthInt = 9 Then + + If SystemDateDayInt <= 6 Then + Var MomCocoaPro = 1 + EndIf + If SystemDateDayInt >= 9 Then Var RobinsonBeautyPro = 1 EndIf diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index 7781676c..adb702c5 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -36,7 +36,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 34 +; menu_new_list 36 ; ==================> Len = 17 ; 12-03-01-0005 12-03-02-0005 12-03-03-0005 @@ -1565,6 +1565,508 @@ MILK" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 12 + ; - 12-03-02-0065 - + + 33 + 22 + 225 + 296 + Flag( 12-03-02-0065.Button,$Sum1203020065) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ซูเปอร์โกโก้เข้ม คูณ 2" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โกโก้ 2x นม และน้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Super Cocoa X2" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Milk, Cocoa, Sugar" + + + 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-03-02-0065.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0065.Button + StringFmt( $12-03-02-0065.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + 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 $Sum1203020065 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0065.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 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1203020065 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - 12-03-02-0067 - + + 33 + 22 + 225 + 296 + Flag( 12-03-02-0067.Button,$Sum1203020067) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ซูเปอร์โกโก้เข้ม คูณ 3" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "โกโก้ 3x นม และน้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Super Cocoa X3" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Milk, Cocoa, Sugar" + + + 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-03-02-0067.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0067.Button + StringFmt( $12-03-02-0067.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + 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 $Sum1203020067 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0067.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 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1203020067 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 17