diff --git a/image/event/robinson_beauty/point_1.png b/image/event/robinson_beauty/point_1.png index df186831..cb632140 100644 Binary files a/image/event/robinson_beauty/point_1.png and b/image/event/robinson_beauty/point_1.png differ diff --git a/image/event/robinson_beauty/point_10.png b/image/event/robinson_beauty/point_10.png new file mode 100644 index 00000000..c3c7c5ad Binary files /dev/null and b/image/event/robinson_beauty/point_10.png differ diff --git a/image/event/robinson_beauty/point_10_en.png b/image/event/robinson_beauty/point_10_en.png new file mode 100644 index 00000000..0a38b30f Binary files /dev/null and b/image/event/robinson_beauty/point_10_en.png differ diff --git a/image/event/robinson_beauty/point_1_en.png b/image/event/robinson_beauty/point_1_en.png index 95464bd7..3d13fbb2 100644 Binary files a/image/event/robinson_beauty/point_1_en.png and b/image/event/robinson_beauty/point_1_en.png differ diff --git a/image/event/robinson_beauty/point_2.png b/image/event/robinson_beauty/point_2.png index df186831..79795eb4 100644 Binary files a/image/event/robinson_beauty/point_2.png and b/image/event/robinson_beauty/point_2.png differ diff --git a/image/event/robinson_beauty/point_2_en.png b/image/event/robinson_beauty/point_2_en.png index bc35bfa7..9ca832a8 100644 Binary files a/image/event/robinson_beauty/point_2_en.png and b/image/event/robinson_beauty/point_2_en.png differ diff --git a/image/event/robinson_beauty/point_3.png b/image/event/robinson_beauty/point_3.png index 7a86355f..7bf05238 100644 Binary files a/image/event/robinson_beauty/point_3.png and b/image/event/robinson_beauty/point_3.png differ diff --git a/image/event/robinson_beauty/point_3_en.png b/image/event/robinson_beauty/point_3_en.png index 7a9be74f..f0693de9 100644 Binary files a/image/event/robinson_beauty/point_3_en.png and b/image/event/robinson_beauty/point_3_en.png differ diff --git a/image/event/robinson_beauty/point_4.png b/image/event/robinson_beauty/point_4.png index a613a982..5706d32d 100644 Binary files a/image/event/robinson_beauty/point_4.png and b/image/event/robinson_beauty/point_4.png differ diff --git a/image/event/robinson_beauty/point_4_en.png b/image/event/robinson_beauty/point_4_en.png index a96035fb..cf4a44ff 100644 Binary files a/image/event/robinson_beauty/point_4_en.png and b/image/event/robinson_beauty/point_4_en.png differ diff --git a/image/event/robinson_beauty/point_6.png b/image/event/robinson_beauty/point_6.png index 5706d32d..a613a982 100644 Binary files a/image/event/robinson_beauty/point_6.png and b/image/event/robinson_beauty/point_6.png differ diff --git a/image/event/robinson_beauty/point_6_en.png b/image/event/robinson_beauty/point_6_en.png index cf4a44ff..a96035fb 100644 Binary files a/image/event/robinson_beauty/point_6_en.png and b/image/event/robinson_beauty/point_6_en.png differ diff --git a/image/event/robinson_beauty/point_7.png b/image/event/robinson_beauty/point_7.png index 7bf05238..7a86355f 100644 Binary files a/image/event/robinson_beauty/point_7.png and b/image/event/robinson_beauty/point_7.png differ diff --git a/image/event/robinson_beauty/point_7_en.png b/image/event/robinson_beauty/point_7_en.png index f0693de9..7a9be74f 100644 Binary files a/image/event/robinson_beauty/point_7_en.png and b/image/event/robinson_beauty/point_7_en.png differ diff --git a/image/event/robinson_beauty/point_8.png b/image/event/robinson_beauty/point_8.png index 79795eb4..df186831 100644 Binary files a/image/event/robinson_beauty/point_8.png and b/image/event/robinson_beauty/point_8.png differ diff --git a/image/event/robinson_beauty/point_8_en.png b/image/event/robinson_beauty/point_8_en.png index 9ca832a8..bc35bfa7 100644 Binary files a/image/event/robinson_beauty/point_8_en.png and b/image/event/robinson_beauty/point_8_en.png differ diff --git a/image/event/robinson_beauty/point_9.png b/image/event/robinson_beauty/point_9.png index cb632140..df186831 100644 Binary files a/image/event/robinson_beauty/point_9.png and b/image/event/robinson_beauty/point_9.png differ diff --git a/image/event/robinson_beauty/point_9_en.png b/image/event/robinson_beauty/point_9_en.png index 3d13fbb2..95464bd7 100644 Binary files a/image/event/robinson_beauty/point_9_en.png and b/image/event/robinson_beauty/point_9_en.png differ diff --git a/image/page_drink_disable_n2/bn_Straw_Lychee_Americano_robinson_beauty.png b/image/page_drink_disable_n2/bn_Straw_Lychee_Americano_robinson_beauty.png index 2b797b21..7e3899f6 100644 Binary files a/image/page_drink_disable_n2/bn_Straw_Lychee_Americano_robinson_beauty.png and b/image/page_drink_disable_n2/bn_Straw_Lychee_Americano_robinson_beauty.png differ diff --git a/image/page_drink_disable_n2/bn_hot_LATTE_Straw_robinson_beauty.png b/image/page_drink_disable_n2/bn_hot_LATTE_Straw_robinson_beauty.png index 402aad13..b33c7181 100644 Binary files a/image/page_drink_disable_n2/bn_hot_LATTE_Straw_robinson_beauty.png and b/image/page_drink_disable_n2/bn_hot_LATTE_Straw_robinson_beauty.png differ diff --git a/image/page_drink_disable_n2/bn_iced_7UP_Lychee_SODA_robinson_beauty.png b/image/page_drink_disable_n2/bn_iced_7UP_Lychee_SODA_robinson_beauty.png new file mode 100644 index 00000000..1c5b0bc3 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_7UP_Lychee_SODA_robinson_beauty.png differ diff --git a/image/page_drink_n/bn_Straw_Lychee_Americano_robinson_beauty.png b/image/page_drink_n/bn_Straw_Lychee_Americano_robinson_beauty.png index f2446eb0..cc8021cc 100644 Binary files a/image/page_drink_n/bn_Straw_Lychee_Americano_robinson_beauty.png and b/image/page_drink_n/bn_Straw_Lychee_Americano_robinson_beauty.png differ diff --git a/image/page_drink_n/bn_hot_LATTE_Straw_robinson_beauty.png b/image/page_drink_n/bn_hot_LATTE_Straw_robinson_beauty.png index e1894933..5a86f10d 100644 Binary files a/image/page_drink_n/bn_hot_LATTE_Straw_robinson_beauty.png and b/image/page_drink_n/bn_hot_LATTE_Straw_robinson_beauty.png differ diff --git a/image/page_drink_n/bn_iced_7UP_Lychee_SODA_robinson_beauty.png b/image/page_drink_n/bn_iced_7UP_Lychee_SODA_robinson_beauty.png new file mode 100644 index 00000000..3674561a Binary files /dev/null and b/image/page_drink_n/bn_iced_7UP_Lychee_SODA_robinson_beauty.png differ diff --git a/image/page_drink_picture2_n/bn_Straw_Lychee_Americano_robinson_beauty.png b/image/page_drink_picture2_n/bn_Straw_Lychee_Americano_robinson_beauty.png index b5005b5a..ea8f50c1 100644 Binary files a/image/page_drink_picture2_n/bn_Straw_Lychee_Americano_robinson_beauty.png and b/image/page_drink_picture2_n/bn_Straw_Lychee_Americano_robinson_beauty.png differ diff --git a/image/page_drink_picture2_n/bn_hot_LATTE_Straw_robinson_beauty.png b/image/page_drink_picture2_n/bn_hot_LATTE_Straw_robinson_beauty.png index d632e348..1e7d0dcc 100644 Binary files a/image/page_drink_picture2_n/bn_hot_LATTE_Straw_robinson_beauty.png and b/image/page_drink_picture2_n/bn_hot_LATTE_Straw_robinson_beauty.png differ diff --git a/image/page_drink_picture2_n/bn_iced_7UP_Lychee_SODA_robinson_beauty.png b/image/page_drink_picture2_n/bn_iced_7UP_Lychee_SODA_robinson_beauty.png new file mode 100644 index 00000000..8c45a14b Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_7UP_Lychee_SODA_robinson_beauty.png differ diff --git a/image/page_drink_press_n/bn_Straw_Lychee_Americano_robinson_beauty.png b/image/page_drink_press_n/bn_Straw_Lychee_Americano_robinson_beauty.png index 70d32015..11520322 100644 Binary files a/image/page_drink_press_n/bn_Straw_Lychee_Americano_robinson_beauty.png and b/image/page_drink_press_n/bn_Straw_Lychee_Americano_robinson_beauty.png differ diff --git a/image/page_drink_press_n/bn_hot_LATTE_Straw_robinson_beauty.png b/image/page_drink_press_n/bn_hot_LATTE_Straw_robinson_beauty.png index c3686817..687fdddc 100644 Binary files a/image/page_drink_press_n/bn_hot_LATTE_Straw_robinson_beauty.png and b/image/page_drink_press_n/bn_hot_LATTE_Straw_robinson_beauty.png differ diff --git a/image/page_drink_press_n/bn_iced_7UP_Lychee_SODA_robinson_beauty.png b/image/page_drink_press_n/bn_iced_7UP_Lychee_SODA_robinson_beauty.png new file mode 100644 index 00000000..c5c7ca62 Binary files /dev/null and b/image/page_drink_press_n/bn_iced_7UP_Lychee_SODA_robinson_beauty.png differ diff --git a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml index 45160c82..e0ee8250 100644 --- a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml +++ b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml @@ -182,6 +182,7 @@ SPLIT Ext1a "/" 7 MenuPoint[6] SPLIT Ext1a "/" 8 MenuPoint[7] SPLIT Ext1a "/" 9 MenuPoint[8] + SPLIT Ext1a "/" 10 MenuPoint[9] INT MenuPoint[0] @@ -193,6 +194,7 @@ INT MenuPoint[6] INT MenuPoint[7] INT MenuPoint[8] + INT MenuPoint[9] DEBUGVAR MenuPoint[0] DEBUGVAR MenuPoint[1] @@ -203,6 +205,7 @@ DEBUGVAR MenuPoint[6] DEBUGVAR MenuPoint[7] DEBUGVAR MenuPoint[8] + DEBUGVAR MenuPoint[9] ; Menu 1 If Seeker.selected_a_drink = "12-05-03-0064" Then @@ -238,6 +241,14 @@ ; Menu 4 + If Seeker.selected_a_drink = "12-01-02-0073" Then + If MenuPoint[3] = 1 then + + Else + Var MenuPoint[3] = 1 + Var newPointIndex = 3 + EndIf + EndIf If Seeker.selected_a_drink = "12-21-02-0073" Then If MenuPoint[3] = 1 then @@ -282,6 +293,14 @@ ; Menu 8 + If Seeker.selected_a_drink = "12-01-02-0074" Then + If MenuPoint[7] = 1 then + + Else + Var MenuPoint[7] = 1 + Var newPointIndex = 7 + EndIf + EndIf If Seeker.selected_a_drink = "12-21-02-0074" Then If MenuPoint[7] = 1 then @@ -302,6 +321,16 @@ EndIf EndIf + ; Menu 10 + If Seeker.selected_a_drink = "12-05-03-0115" Then + If MenuPoint[9] = 1 then + + Else + Var MenuPoint[9] = 1 + Var newPointIndex = 9 + EndIf + EndIf + Var CurrentIndexPoint = -1 @@ -359,6 +388,12 @@ Var PointNameIndex[CurrentIndexPoint] = 8 EndIf + If MenuPoint[9] = 1 Then + Var CurrentIndexPoint = CurrentIndexPoint + 1 + Var PointState[CurrentIndexPoint] = 1 + Var PointNameIndex[CurrentIndexPoint] = 9 + EndIf + DEBUGVAR Seeker.selected_a_drink DEBUGVAR newPointIndex diff --git a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_3.xml b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_3.xml index 5cc395f9..a55849f3 100644 --- a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_3.xml +++ b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_3.xml @@ -133,11 +133,19 @@ EndIf If PointState[8] = 1 Then Var PointCount = PointCount + 1 - If show_eng = "true" Then - Var taobinImgPoint[8] = "/point_9_en.png" - Else - Var taobinImgPoint[8] = "/point_9.png" - EndIf + If MenuPoint[9] = 1 Then + If show_eng = "true" Then + Var taobinImgPoint[8] = "/point_10_en.png" + Else + Var taobinImgPoint[8] = "/point_10.png" + EndIf + Else + If show_eng = "true" Then + Var taobinImgPoint[8] = "/point_9_en.png" + Else + Var taobinImgPoint[8] = "/point_9.png" + EndIf + EndIf EndIf Var PointDiff = 9 - PointCount diff --git a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_error.xml b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_error.xml index e037f14f..7dc69e03 100644 --- a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_error.xml +++ b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_error.xml @@ -55,6 +55,9 @@ ; Menu 4 + If Seeker.selected_a_drink = "12-01-02-0073" Then + Var newPointIndex = 3 + EndIf If Seeker.selected_a_drink = "12-21-02-0073" Then Var newPointIndex = 3 EndIf @@ -79,6 +82,9 @@ ; Menu 8 + If Seeker.selected_a_drink = "12-01-02-0074" Then + Var newPointIndex = 7 + EndIf If Seeker.selected_a_drink = "12-21-02-0074" Then Var newPointIndex = 7 EndIf @@ -88,7 +94,11 @@ If Seeker.selected_a_drink = "12-02-03-0053" Then Var newPointIndex = 8 EndIf - + + ; Menu 10 + If Seeker.selected_a_drink = "12-05-03-0115" Then + Var newPointIndex = 8 + EndIf Var CurrentPointSlot = newPointIndex + 1 Var CurrentPointCheck = "check" diff --git a/xml/page_catalog_group_pro_robinson_beauty.xml b/xml/page_catalog_group_pro_robinson_beauty.xml index 51f2f763..70efde45 100644 --- a/xml/page_catalog_group_pro_robinson_beauty.xml +++ b/xml/page_catalog_group_pro_robinson_beauty.xml @@ -35,7 +35,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 9 +; menu_new_list 10 ; ==================> Len = 12 ; - - 12-05-03-0064 @@ -2816,6 +2816,258 @@ CHEE TEA" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 12 + ; - - 12-05-03-0115 + + 33 + 22 + 225 + 296 + Flag( 12-05-03-0115.Button,$Sum1205030115) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "โรบินสันอัพชี่" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เซเว่น อัพ ลิ้นจี่ มะนาว โซดา " + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "ROBINSON UP CHEE SMOOTHIE" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "7Up Lychee Lime Soda" + + + 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-05-03-0115.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0115.Button + StringFmt( $12-05-03-0115.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 $Sum1205030115 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0115.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" + $Sum1205030115 + text_unavailable + center-vertical-horizontal + ; - - -