diff --git a/image/page_drink_disable_n2/bn_CARAMEL_MILK _BISCOFF.png b/image/page_drink_disable_n2/bn_CARAMEL_MILK _BISCOFF.png index a9133922..267e5704 100644 Binary files a/image/page_drink_disable_n2/bn_CARAMEL_MILK _BISCOFF.png and b/image/page_drink_disable_n2/bn_CARAMEL_MILK _BISCOFF.png differ diff --git a/image/page_drink_disable_n2/bn_STRAWBERRY_MILK_BISCOFF.png b/image/page_drink_disable_n2/bn_STRAWBERRY_MILK_BISCOFF.png index f7187786..6bd34cea 100644 Binary files a/image/page_drink_disable_n2/bn_STRAWBERRY_MILK_BISCOFF.png and b/image/page_drink_disable_n2/bn_STRAWBERRY_MILK_BISCOFF.png differ diff --git a/image/page_drink_disable_n2/bn_STRAWBERRY_MILK_MINT_BISCOFF.png b/image/page_drink_disable_n2/bn_STRAWBERRY_MILK_MINT_BISCOFF.png index 22c8e21c..74df1df5 100644 Binary files a/image/page_drink_disable_n2/bn_STRAWBERRY_MILK_MINT_BISCOFF.png and b/image/page_drink_disable_n2/bn_STRAWBERRY_MILK_MINT_BISCOFF.png differ diff --git a/image/page_drink_n/bn_CARAMEL_MILK _BISCOFF.png b/image/page_drink_n/bn_CARAMEL_MILK _BISCOFF.png index 6a9df772..dac9a34a 100644 Binary files a/image/page_drink_n/bn_CARAMEL_MILK _BISCOFF.png and b/image/page_drink_n/bn_CARAMEL_MILK _BISCOFF.png differ diff --git a/image/page_drink_n/bn_STRAWBERRY_MILK_BISCOFF.png b/image/page_drink_n/bn_STRAWBERRY_MILK_BISCOFF.png index 5defc32f..e469fc51 100644 Binary files a/image/page_drink_n/bn_STRAWBERRY_MILK_BISCOFF.png and b/image/page_drink_n/bn_STRAWBERRY_MILK_BISCOFF.png differ diff --git a/image/page_drink_n/bn_STRAWBERRY_MILK_MINT_BISCOFF.png b/image/page_drink_n/bn_STRAWBERRY_MILK_MINT_BISCOFF.png index 679fb92b..3aa9a7c7 100644 Binary files a/image/page_drink_n/bn_STRAWBERRY_MILK_MINT_BISCOFF.png and b/image/page_drink_n/bn_STRAWBERRY_MILK_MINT_BISCOFF.png differ diff --git a/image/page_drink_picture2_n/bn_CARAMEL_MILK _BISCOFF.png b/image/page_drink_picture2_n/bn_CARAMEL_MILK _BISCOFF.png index c4a50a0b..e4e519df 100644 Binary files a/image/page_drink_picture2_n/bn_CARAMEL_MILK _BISCOFF.png and b/image/page_drink_picture2_n/bn_CARAMEL_MILK _BISCOFF.png differ diff --git a/image/page_drink_picture2_n/bn_STRAWBERRY_MILK_BISCOFF.png b/image/page_drink_picture2_n/bn_STRAWBERRY_MILK_BISCOFF.png index cb4df395..a240181a 100644 Binary files a/image/page_drink_picture2_n/bn_STRAWBERRY_MILK_BISCOFF.png and b/image/page_drink_picture2_n/bn_STRAWBERRY_MILK_BISCOFF.png differ diff --git a/image/page_drink_picture2_n/bn_STRAWBERRY_MILK_MINT_BISCOFF.png b/image/page_drink_picture2_n/bn_STRAWBERRY_MILK_MINT_BISCOFF.png index e4b405d2..c6ba8842 100644 Binary files a/image/page_drink_picture2_n/bn_STRAWBERRY_MILK_MINT_BISCOFF.png and b/image/page_drink_picture2_n/bn_STRAWBERRY_MILK_MINT_BISCOFF.png differ diff --git a/image/page_drink_press_n/bn_CARAMEL_MILK _BISCOFF.png b/image/page_drink_press_n/bn_CARAMEL_MILK _BISCOFF.png index db014b5a..322ba44a 100644 Binary files a/image/page_drink_press_n/bn_CARAMEL_MILK _BISCOFF.png and b/image/page_drink_press_n/bn_CARAMEL_MILK _BISCOFF.png differ diff --git a/image/page_drink_press_n/bn_STRAWBERRY_MILK_BISCOFF.png b/image/page_drink_press_n/bn_STRAWBERRY_MILK_BISCOFF.png index 110c22cc..c9668241 100644 Binary files a/image/page_drink_press_n/bn_STRAWBERRY_MILK_BISCOFF.png and b/image/page_drink_press_n/bn_STRAWBERRY_MILK_BISCOFF.png differ diff --git a/image/page_drink_press_n/bn_STRAWBERRY_MILK_MINT_BISCOFF.png b/image/page_drink_press_n/bn_STRAWBERRY_MILK_MINT_BISCOFF.png index ecd4e9df..3ab09bae 100644 Binary files a/image/page_drink_press_n/bn_STRAWBERRY_MILK_MINT_BISCOFF.png and b/image/page_drink_press_n/bn_STRAWBERRY_MILK_MINT_BISCOFF.png differ diff --git a/inter/sgp/xml/page_brewing3.lxml b/inter/sgp/xml/page_brewing3.lxml index c1a94191..3639cbf0 100644 --- a/inter/sgp/xml/page_brewing3.lxml +++ b/inter/sgp/xml/page_brewing3.lxml @@ -7,7 +7,7 @@ Var SendNotiPaySuccess = 2 - Var GetMoreStrawCount = 3 + Var GetMoreStrawCount = 2 Var CountUpWhenBREW_CNT = 0 DEBUGVAR TxRef1 diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index 8102c213..00e6a58b 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -6,6 +6,8 @@ TAGESP TAGESP มะพร้าวน้ำหอมปั่น Coconut smoothie น้ำเชื่อมมะพร้าว และน้ำ Coconut Syrup and Water - - 12-05-03-0092 bn_smoothie_coconut.png - - - posi1 มะพร้าวน้ำหอมปั่น\nนมนิวซีแลนด์ coconut milk น้ำเชื่อมมะพร้าว นม และน้ำ Coconut syrup, Milk,\nWater - 12-03-02-0058 12-03-03-0058 bn_iced_milk_coconut.png - - - posi1 + เป๊ปซี่นมโอริโอ้ภูเขาไฟ Pepsi Oreo เป๊ปซี่ นม และโอริโอ้ Pepsi, Milk, Oreo and Ice - - 12-99-03-0066 bn_PEPSI_OREO.png - - - posi1 + เป๊ปซี่นม Pepsi milk เป๊ปซี่ นม Pepsi, Milk - 12-99-02-0003 - bn_PEPSI_MILK.png - - - posi1 โอริโอ้ปั่นภูเขาไฟ OREO SMOOTHIE \nVOLCANO นม น้ำตาล โอริโอ้ \n Milk, Sugar, Oreo - - 12-03-03-0009 bn_smoothie_oreo.png - - - posi2 - - ฿55.00 NN NN โกโก้ COCOA โกโก้ นมและน้ำตาล Milk, Cocoa, Sugar 12-03-01-0002 12-03-02-0002 12-03-03-0002 bn_iced_cocoa.png - - - posi1 ฿30.00 ฿35.00 ฿40.00 TRUE TRUE นมกล้วยปั่น\nโอริโอ้ภูเขาไฟ BANANA MILK OREO \nVOLCANO น้ำเชื่อมกล้วย นม น้ำตาล Oreo Banana Syrup, Milk,\nSugar, Oreo - - 12-03-03-0029 bn_BananaOreo_smoothie.png - - - posi1 - - ฿50.00 NN diff --git a/xml/event/promotion_energy_drink_1_bath.xml b/xml/event/promotion_energy_drink_1_bath.xml index b6497321..0e2c75f0 100644 --- a/xml/event/promotion_energy_drink_1_bath.xml +++ b/xml/event/promotion_energy_drink_1_bath.xml @@ -1833,6 +1833,508 @@ Water" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 12 + ; - - 12-99-03-0066 + + 33 + 22 + 225 + 296 + Flag( 12-99-03-0066.Button,Disable=Invisible,$Sum1299030066) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เป๊ปซี่นมโอริโอ้ภูเขาไฟ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เป๊ปซี่ นม และโอริโอ้" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Pepsi Oreo" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Pepsi, Milk, Oreo and 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" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-99-03-0066.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-99-03-0066.Button + StringFmt( $12-99-03-0066.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 $Sum1299030066 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-99-03-0066.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" + $Sum1299030066 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - 12-99-02-0003 - + + 33 + 22 + 225 + 296 + Flag( 12-99-02-0003.Button,Disable=Invisible,$Sum1299020003) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เป๊ปซี่นม" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เป๊ปซี่ นม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Pepsi milk" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Pepsi, Milk" + + + 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-99-02-0003.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-99-02-0003.Button + StringFmt( $12-99-02-0003.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 $Sum1299020003 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-99-02-0003.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" + $Sum1299020003 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 17 @@ -12551,91 +13053,6 @@ LIMENADE SODA" - - - - Var BigButtonEnable = "Enable" - Refresh - - - Var BigButtonEnable = "Invisible" - Refresh - - + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เป๊ปซี่นมโอริโอ้ภูเขาไฟ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เป๊ปซี่ นม และโอริโอ้" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Pepsi Oreo" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Pepsi, Milk, Oreo and Ice" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-99-03-0066.Button + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-99-03-0066.Button + Var( "฿" + $12-99-03-0066.Price ) + + + 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 $Sum1299030066 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-99-03-0066.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" + $Sum1299030066 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - 12-99-02-0003 - + + 33 + 22 + 225 + 296 + Flag( 12-99-02-0003.Button,Disable=Invisible,$Sum1299020003) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เป๊ปซี่นม" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เป๊ปซี่ นม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Pepsi milk" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Pepsi, Milk" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-99-02-0003.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-99-02-0003.Button + Var( "฿" + $12-99-02-0003.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 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 $Sum1299020003 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-99-02-0003.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" + $Sum1299020003 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 17 diff --git a/xml/menutab/page_catalog_group_recommend.xml b/xml/menutab/page_catalog_group_recommend.xml index 0232b7c3..fd734ca5 100644 --- a/xml/menutab/page_catalog_group_recommend.xml +++ b/xml/menutab/page_catalog_group_recommend.xml @@ -624,7 +624,7 @@ ;dummy_layout.inc -; menu_new_list 47 +; menu_new_list 49 ;TAGESP ; ==================> Len = 17 ; 12-02-01-0039 12-02-02-0039 12-02-03-0039 @@ -1390,6 +1390,512 @@ Water" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 12 + ; - - 12-99-03-0066 + + 33 + 22 + 225 + 296 + Flag( 12-99-03-0066.Button,Disable=Invisible,$Sum1299030066) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เป๊ปซี่นมโอริโอ้ภูเขาไฟ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เป๊ปซี่ นม และโอริโอ้" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Pepsi Oreo" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Pepsi, Milk, Oreo and Ice" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + "Invisible" + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-99-03-0066.Button + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-99-03-0066.Button + Var( "฿" + $12-99-03-0066.Price ) + + + 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 $Sum1299030066 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-99-03-0066.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" + $Sum1299030066 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - 12-99-02-0003 - + + 33 + 22 + 225 + 296 + Flag( 12-99-02-0003.Button,Disable=Invisible,$Sum1299020003) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เป๊ปซี่นม" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เป๊ปซี่ นม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Pepsi milk" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Pepsi, Milk" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-99-02-0003.Button + + + 115 + 265 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-99-02-0003.Button + Var( "฿" + $12-99-02-0003.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 183 + 264 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 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 $Sum1299020003 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-99-02-0003.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" + $Sum1299020003 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 17 diff --git a/xml/page_board.xml b/xml/page_board.xml index 4ba34049..837532de 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -1053,15 +1053,38 @@ Var GetNamHomCoconutRemainReward = 0 Var NamHomCoconutRemainReward_Y = 1071 Var NamHomCoconutRemainRewardNumber_Y = 1130 + Var dummyPhone = "089999999" + + If GetNamHomCoconutRemainRewardLastTime = "" Then + Var GetNamHomCoconutRemainRewardLastTime = 0 + EndIf + DEBUGVAR NamHomCoconutPro DEBUGVAR CurrentMainVideo If NamHomCoconutPro = 1 Then If CurrentMainVideo = 2 Then Var ShouldShowNamHomCoconutRemainReward = 1 + DEBUGVAR GetNamHomCoconutRemainRewardLastTime + DEBUGVAR SystemTimeMinuteInt + Var TimeDiff = SystemTimeMinuteInt - GetNamHomCoconutRemainRewardLastTime + DEBUGVAR TimeDiff + If TimeDiff >= 15 Then + DEBUGVAR "update nam hom coconut remain reward!!!" + DEBUGVAR GetNamHomCoconutRemainReward + If GetNamHomCoconutRemainReward = 0 Then + GETACCEXT dummyPhone 34 + Var GetNamHomCoconutRemainReward = 1 + EndIf + Else + If TimeDiff <= -15 Then + DEBUGVAR "update nam hom coconut remain reward!!!" + If GetNamHomCoconutRemainReward = 0 Then + GETACCEXT dummyPhone 34 + Var GetNamHomCoconutRemainReward = 1 + EndIf + EndIf + EndIf EndIf - Var GetNamHomCoconutRemainReward = 1 - Var dummy_phone = "089999999" - GETACCEXT dummy_phone 34 EndIf If EnergyDrink1BathPro = 1 Then @@ -1140,6 +1163,7 @@ Var NamHomCoconutRemainReward = SumNamHomCoconutRemainReward DEBUGVAR NamHomCoconutRemainReward + Var GetNamHomCoconutRemainRewardLastTime = SystemTimeMinuteInt EndIf EndIf diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index 7a368a18..2680cdd3 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -94,7 +94,7 @@ ;dummy_layout.inc -; menu_new_list 47 +; menu_new_list 49 ;TAGESP ; ==================> Len = 17 ; 12-02-01-0039 12-02-02-0039 12-02-03-0039 @@ -854,6 +854,508 @@ Water" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 12 + ; - - 12-99-03-0066 + + 33 + 22 + 225 + 296 + Flag( 12-99-03-0066.Button,Disable=Invisible,$Sum1299030066) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เป๊ปซี่นมโอริโอ้ภูเขาไฟ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เป๊ปซี่ นม และโอริโอ้" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Pepsi Oreo" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Pepsi, Milk, Oreo and 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" ) + "Invisible" + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-99-03-0066.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-99-03-0066.Button + StringFmt( $12-99-03-0066.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 $Sum1299030066 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-99-03-0066.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" + $Sum1299030066 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 12 + ; - 12-99-02-0003 - + + 33 + 22 + 225 + 296 + Flag( 12-99-02-0003.Button,Disable=Invisible,$Sum1299020003) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เป๊ปซี่นม" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เป๊ปซี่ นม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "Pepsi milk" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Pepsi, Milk" + + + 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-99-02-0003.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-99-02-0003.Button + StringFmt( $12-99-02-0003.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 $Sum1299020003 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-99-02-0003.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" + $Sum1299020003 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 17 diff --git a/xml_main/startup.xml b/xml_main/startup.xml index ce2f53ce..8492ceaa 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "8.56" - Var XMLPageVersionInt = 856 + Var XMLPageVersion = "8.57" + Var XMLPageVersionInt = 857 ;Oreo Var OreoGuarantee = 0