diff --git a/image/page_drink_disable_n2/bn_cursed_coffee.png b/image/page_drink_disable_n2/bn_cursed_coffee.png index 7d9c7cc6..ae224f3e 100644 Binary files a/image/page_drink_disable_n2/bn_cursed_coffee.png and b/image/page_drink_disable_n2/bn_cursed_coffee.png differ diff --git a/image/page_drink_disable_n2/bn_haunted_harvert.png b/image/page_drink_disable_n2/bn_haunted_harvert.png index 85335ad1..392b56a8 100644 Binary files a/image/page_drink_disable_n2/bn_haunted_harvert.png and b/image/page_drink_disable_n2/bn_haunted_harvert.png differ diff --git a/image/page_drink_disable_n2/bn_haunted_haza.png b/image/page_drink_disable_n2/bn_haunted_haza.png index 4265154f..e973283c 100644 Binary files a/image/page_drink_disable_n2/bn_haunted_haza.png and b/image/page_drink_disable_n2/bn_haunted_haza.png differ diff --git a/image/page_drink_disable_n2/bn_haunted_woods.png b/image/page_drink_disable_n2/bn_haunted_woods.png index 7f4ff485..f449a508 100644 Binary files a/image/page_drink_disable_n2/bn_haunted_woods.png and b/image/page_drink_disable_n2/bn_haunted_woods.png differ diff --git a/image/page_drink_disable_n2/bn_haunted_woods_50.png b/image/page_drink_disable_n2/bn_haunted_woods_50.png new file mode 100644 index 00000000..84fd4fcd Binary files /dev/null and b/image/page_drink_disable_n2/bn_haunted_woods_50.png differ diff --git a/image/page_drink_disable_n2/bn_haunting_hag_of_village.png b/image/page_drink_disable_n2/bn_haunting_hag_of_village.png index f16f490f..bdf0c85a 100644 Binary files a/image/page_drink_disable_n2/bn_haunting_hag_of_village.png and b/image/page_drink_disable_n2/bn_haunting_hag_of_village.png differ diff --git a/image/page_drink_disable_n2/bn_haunting_of_the_past.png b/image/page_drink_disable_n2/bn_haunting_of_the_past.png index 04fbfb8a..f5b90942 100644 Binary files a/image/page_drink_disable_n2/bn_haunting_of_the_past.png and b/image/page_drink_disable_n2/bn_haunting_of_the_past.png differ diff --git a/image/page_drink_disable_n2/bn_midnight_enigma.png b/image/page_drink_disable_n2/bn_midnight_enigma.png index 2e12c8c8..29b21eee 100644 Binary files a/image/page_drink_disable_n2/bn_midnight_enigma.png and b/image/page_drink_disable_n2/bn_midnight_enigma.png differ diff --git a/image/page_drink_disable_n2/bn_mysterious_music_box.png b/image/page_drink_disable_n2/bn_mysterious_music_box.png index 6fe62a6a..f0326fa7 100644 Binary files a/image/page_drink_disable_n2/bn_mysterious_music_box.png and b/image/page_drink_disable_n2/bn_mysterious_music_box.png differ diff --git a/image/page_drink_disable_n2/bn_redmoon.png b/image/page_drink_disable_n2/bn_redmoon.png index 1d92901e..2e806e68 100644 Binary files a/image/page_drink_disable_n2/bn_redmoon.png and b/image/page_drink_disable_n2/bn_redmoon.png differ diff --git a/image/page_drink_disable_n2/bn_room_no_13.png b/image/page_drink_disable_n2/bn_room_no_13.png index 84552b9f..9e0a4be8 100644 Binary files a/image/page_drink_disable_n2/bn_room_no_13.png and b/image/page_drink_disable_n2/bn_room_no_13.png differ diff --git a/image/page_drink_disable_n2/bn_the_dark_lord.png b/image/page_drink_disable_n2/bn_the_dark_lord.png index eef2e9f1..cc9a5eb7 100644 Binary files a/image/page_drink_disable_n2/bn_the_dark_lord.png and b/image/page_drink_disable_n2/bn_the_dark_lord.png differ diff --git a/image/page_drink_disable_n2/bn_unbelievers_demise.png b/image/page_drink_disable_n2/bn_unbelievers_demise.png index 18cfc435..a889e3dd 100644 Binary files a/image/page_drink_disable_n2/bn_unbelievers_demise.png and b/image/page_drink_disable_n2/bn_unbelievers_demise.png differ diff --git a/image/page_drink_disable_n2/bn_white_lady.png b/image/page_drink_disable_n2/bn_white_lady.png index dcac22ad..8962c550 100644 Binary files a/image/page_drink_disable_n2/bn_white_lady.png and b/image/page_drink_disable_n2/bn_white_lady.png differ diff --git a/image/page_drink_n/bn_haunted_woods50.png b/image/page_drink_n/bn_haunted_woods50.png deleted file mode 100644 index 9141423f..00000000 Binary files a/image/page_drink_n/bn_haunted_woods50.png and /dev/null differ diff --git a/image/page_drink_disable_n2/bn_haunted_woods50.png b/image/page_drink_n/bn_haunted_woods_50.png similarity index 100% rename from image/page_drink_disable_n2/bn_haunted_woods50.png rename to image/page_drink_n/bn_haunted_woods_50.png diff --git a/image/page_drink_picture2_n/bn_cursed_coffee.png b/image/page_drink_picture2_n/bn_cursed_coffee.png new file mode 100644 index 00000000..98df8de2 Binary files /dev/null and b/image/page_drink_picture2_n/bn_cursed_coffee.png differ diff --git a/image/page_drink_picture2_n/bn_haunted_harvert.png b/image/page_drink_picture2_n/bn_haunted_harvert.png new file mode 100644 index 00000000..dcf81d38 Binary files /dev/null and b/image/page_drink_picture2_n/bn_haunted_harvert.png differ diff --git a/image/page_drink_picture2_n/bn_haunted_haza.png b/image/page_drink_picture2_n/bn_haunted_haza.png new file mode 100644 index 00000000..0712daa5 Binary files /dev/null and b/image/page_drink_picture2_n/bn_haunted_haza.png differ diff --git a/image/page_drink_picture2_n/bn_haunted_woods.png b/image/page_drink_picture2_n/bn_haunted_woods.png new file mode 100644 index 00000000..973be0d5 Binary files /dev/null and b/image/page_drink_picture2_n/bn_haunted_woods.png differ diff --git a/image/page_drink_picture2_n/bn_haunted_woods_50.png b/image/page_drink_picture2_n/bn_haunted_woods_50.png new file mode 100644 index 00000000..15110dc6 Binary files /dev/null and b/image/page_drink_picture2_n/bn_haunted_woods_50.png differ diff --git a/image/page_drink_picture2_n/bn_haunting_hag_of_village.png b/image/page_drink_picture2_n/bn_haunting_hag_of_village.png new file mode 100644 index 00000000..ddd9536c Binary files /dev/null and b/image/page_drink_picture2_n/bn_haunting_hag_of_village.png differ diff --git a/image/page_drink_picture2_n/bn_haunting_of_the_past.png b/image/page_drink_picture2_n/bn_haunting_of_the_past.png new file mode 100644 index 00000000..674c6745 Binary files /dev/null and b/image/page_drink_picture2_n/bn_haunting_of_the_past.png differ diff --git a/image/page_drink_picture2_n/bn_midnight_enigma.png b/image/page_drink_picture2_n/bn_midnight_enigma.png new file mode 100644 index 00000000..35420745 Binary files /dev/null and b/image/page_drink_picture2_n/bn_midnight_enigma.png differ diff --git a/image/page_drink_picture2_n/bn_mysterious_music_box.png b/image/page_drink_picture2_n/bn_mysterious_music_box.png new file mode 100644 index 00000000..e0c7728d Binary files /dev/null and b/image/page_drink_picture2_n/bn_mysterious_music_box.png differ diff --git a/image/page_drink_picture2_n/bn_redmoon.png b/image/page_drink_picture2_n/bn_redmoon.png new file mode 100644 index 00000000..55518004 Binary files /dev/null and b/image/page_drink_picture2_n/bn_redmoon.png differ diff --git a/image/page_drink_picture2_n/bn_room_no_13.png b/image/page_drink_picture2_n/bn_room_no_13.png new file mode 100644 index 00000000..5b7a9aa0 Binary files /dev/null and b/image/page_drink_picture2_n/bn_room_no_13.png differ diff --git a/image/page_drink_picture2_n/bn_the_dark_lord.png b/image/page_drink_picture2_n/bn_the_dark_lord.png new file mode 100644 index 00000000..25cf6d63 Binary files /dev/null and b/image/page_drink_picture2_n/bn_the_dark_lord.png differ diff --git a/image/page_drink_picture2_n/bn_unbelievers_demise.png b/image/page_drink_picture2_n/bn_unbelievers_demise.png new file mode 100644 index 00000000..f7c87714 Binary files /dev/null and b/image/page_drink_picture2_n/bn_unbelievers_demise.png differ diff --git a/image/page_drink_picture2_n/bn_white_lady.png b/image/page_drink_picture2_n/bn_white_lady.png new file mode 100644 index 00000000..ee36a5a7 Binary files /dev/null and b/image/page_drink_picture2_n/bn_white_lady.png differ diff --git a/image/page_drink_press_n/bn_cursed_coffee.png b/image/page_drink_press_n/bn_cursed_coffee.png index 7d9c7cc6..d02fc17f 100644 Binary files a/image/page_drink_press_n/bn_cursed_coffee.png and b/image/page_drink_press_n/bn_cursed_coffee.png differ diff --git a/image/page_drink_press_n/bn_haunted_harvert.png b/image/page_drink_press_n/bn_haunted_harvert.png index 85335ad1..7cb36aa7 100644 Binary files a/image/page_drink_press_n/bn_haunted_harvert.png and b/image/page_drink_press_n/bn_haunted_harvert.png differ diff --git a/image/page_drink_press_n/bn_haunted_haza.png b/image/page_drink_press_n/bn_haunted_haza.png index 4265154f..a7593051 100644 Binary files a/image/page_drink_press_n/bn_haunted_haza.png and b/image/page_drink_press_n/bn_haunted_haza.png differ diff --git a/image/page_drink_press_n/bn_haunted_woods.png b/image/page_drink_press_n/bn_haunted_woods.png index 7f4ff485..df80c7dd 100644 Binary files a/image/page_drink_press_n/bn_haunted_woods.png and b/image/page_drink_press_n/bn_haunted_woods.png differ diff --git a/image/page_drink_press_n/bn_haunted_woods50.png b/image/page_drink_press_n/bn_haunted_woods50.png deleted file mode 100644 index 9141423f..00000000 Binary files a/image/page_drink_press_n/bn_haunted_woods50.png and /dev/null differ diff --git a/image/page_drink_press_n/bn_haunted_woods_50.png b/image/page_drink_press_n/bn_haunted_woods_50.png new file mode 100644 index 00000000..df6cc0a5 Binary files /dev/null and b/image/page_drink_press_n/bn_haunted_woods_50.png differ diff --git a/image/page_drink_press_n/bn_haunting_hag_of_village.png b/image/page_drink_press_n/bn_haunting_hag_of_village.png index f16f490f..07351b19 100644 Binary files a/image/page_drink_press_n/bn_haunting_hag_of_village.png and b/image/page_drink_press_n/bn_haunting_hag_of_village.png differ diff --git a/image/page_drink_press_n/bn_haunting_of_the_past.png b/image/page_drink_press_n/bn_haunting_of_the_past.png index 04fbfb8a..8cb78f8d 100644 Binary files a/image/page_drink_press_n/bn_haunting_of_the_past.png and b/image/page_drink_press_n/bn_haunting_of_the_past.png differ diff --git a/image/page_drink_press_n/bn_midnight_enigma.png b/image/page_drink_press_n/bn_midnight_enigma.png index 2e12c8c8..dbdb16d4 100644 Binary files a/image/page_drink_press_n/bn_midnight_enigma.png and b/image/page_drink_press_n/bn_midnight_enigma.png differ diff --git a/image/page_drink_press_n/bn_mysterious_music_box.png b/image/page_drink_press_n/bn_mysterious_music_box.png index 6fe62a6a..835943a3 100644 Binary files a/image/page_drink_press_n/bn_mysterious_music_box.png and b/image/page_drink_press_n/bn_mysterious_music_box.png differ diff --git a/image/page_drink_press_n/bn_redmoon.png b/image/page_drink_press_n/bn_redmoon.png index 1d92901e..4f39ad75 100644 Binary files a/image/page_drink_press_n/bn_redmoon.png and b/image/page_drink_press_n/bn_redmoon.png differ diff --git a/image/page_drink_press_n/bn_room_no_13.png b/image/page_drink_press_n/bn_room_no_13.png index 84552b9f..14f431d9 100644 Binary files a/image/page_drink_press_n/bn_room_no_13.png and b/image/page_drink_press_n/bn_room_no_13.png differ diff --git a/image/page_drink_press_n/bn_the_dark_lord.png b/image/page_drink_press_n/bn_the_dark_lord.png index eef2e9f1..2ad0f111 100644 Binary files a/image/page_drink_press_n/bn_the_dark_lord.png and b/image/page_drink_press_n/bn_the_dark_lord.png differ diff --git a/image/page_drink_press_n/bn_unbelievers_demise.png b/image/page_drink_press_n/bn_unbelievers_demise.png index 18cfc435..7d6a952d 100644 Binary files a/image/page_drink_press_n/bn_unbelievers_demise.png and b/image/page_drink_press_n/bn_unbelievers_demise.png differ diff --git a/image/page_drink_press_n/bn_white_lady.png b/image/page_drink_press_n/bn_white_lady.png index dcac22ad..5c23f265 100644 Binary files a/image/page_drink_press_n/bn_white_lady.png and b/image/page_drink_press_n/bn_white_lady.png differ diff --git a/image/topping2/bg_milk_choice.png b/image/topping2/bg_milk_choice.png index 9bae1726..35322147 100644 Binary files a/image/topping2/bg_milk_choice.png and b/image/topping2/bg_milk_choice.png differ diff --git a/image/topping2/bg_milk_choice_j.png b/image/topping2/bg_milk_choice_j.png new file mode 100644 index 00000000..b76121ed Binary files /dev/null and b/image/topping2/bg_milk_choice_j.png differ diff --git a/image/topping2/cb_disable_check.png b/image/topping2/cb_disable_check.png new file mode 100644 index 00000000..2630e827 Binary files /dev/null and b/image/topping2/cb_disable_check.png differ diff --git a/image/topping2_en/bg_milk_choice.png b/image/topping2_en/bg_milk_choice.png new file mode 100644 index 00000000..6f92e205 Binary files /dev/null and b/image/topping2_en/bg_milk_choice.png differ diff --git a/image/topping2_en/bg_milk_choice_j.png b/image/topping2_en/bg_milk_choice_j.png new file mode 100644 index 00000000..542fb9b1 Binary files /dev/null and b/image/topping2_en/bg_milk_choice_j.png differ diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index 530475b7..bb928a91 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -385,15 +385,14 @@ Name=Momday,file=page_catalog_momday.skt Name=pepween,file=page_catalog_group_pro_pepween.skt พระจันทร์สีเลือด Red Moon เป๊ปซี่ น้ำเชื่อมสตรอเบอร์รี่ ผงมะนาว และโซดา Pepsi, Strawberry, Limenade and Soda - 12-99-05-0053 - bn_redmoon.png - - - สุภาพสตรีสีขาว White Lady เป๊ปซี่ ชามะลิ น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา Pepsi, Jasmine Tea, Lychee Lime and Soda - 12-99-05-0054 - bn_white_lady.png - - - - เสียงดนตรีตอนตี 3 Mysterious music box เป๊ปซี่ ขิง ผงมะนาว และโซดา Pepsi, Ginger, Lime and Soda - 12-99-05-0055 - bn_mysterious_music_box.png - - - - หมอกควันแห่งความมืด Haunted Haze เป๊ปซี่ น้ำเชื่อมบ๊วย น้ำเชื่อมลิ้นจี่ และโซดา Pepsi, Lychee, Plum and Soda - 12-99-05-0056 - bn_haunted_haza.png - - - - พยาบาทชาติที่แล้ว The Haunting of the Past เป๊ปซี่ น้ำเชื่อมชูกำลัง ผงมะนาว และโซดา Pepsi Energy, Lime and Soda - 12-99-05-0057 - bn_haunting_of_the_past.png - - - - ท่านเคาท์เขย่าขวัญ The dark lord เป๊ปซี่ น้ำเชื่อมสละ ผงมะนาว และโซดา Pepsi Salak, Lime and Soda - 12-99-05-0058 - bn_the_dark_load.png - - - - ห้องเชือดหมายเลข 13 Room no.13 เป๊ปซี่ น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา pepsi, lychee , Lime and Soda - 12-99-05-0059 - bn_room_no_13.png - - - - ค่ำคืนคอยหลอน Haunted Harvest เป๊ปซี่ มัทฉะ และโซดา Pepsi, Matcha and Soda - 12-99-05-0060 - bn_huanted_harvert.png - - - + เสียงดนตรีตอนตี 3 Mysterious\nmusic box เป๊ปซี่ ขิง ผงมะนาว และโซดา Pepsi, Ginger, Lime and Soda - 12-99-05-0055 - bn_mysterious_music_box.png - - - + หมอกควัน\nแห่งความมืด Haunted Haze เป๊ปซี่ น้ำเชื่อมบ๊วย น้ำเชื่อมลิ้นจี่ และโซดา Pepsi, Lychee, Plum and Soda - 12-99-05-0056 - bn_haunted_haza.png - - - + พยาบาทชาติที่แล้ว The Haunting of\nthe Past เป๊ปซี่ น้ำเชื่อมชูกำลัง ผงมะนาว และโซดา Pepsi Energy, Lime and Soda - 12-99-05-0057 - bn_haunting_of_the_past.png - - - + ท่านเคาท์เขย่าขวัญ The dark lord เป๊ปซี่ น้ำเชื่อมสละ ผงมะนาว และโซดา Pepsi Salak, Lime and Soda - 12-99-05-0058 - bn_the_dark_lord.png - - - + ห้องเชือด\nหมายเลข 13 Room no.13 เป๊ปซี่ น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา pepsi, lychee , Lime and Soda - 12-99-05-0059 - bn_room_no_13.png - - - + ค่ำคืนคอยหลอน Haunted Harvest เป๊ปซี่ มัทฉะ และโซดา Pepsi, Matcha and Soda - 12-99-05-0060 - bn_haunted_harvert.png - - - แม่ชีไร้หัว Cursed Coffee เป๊ปซี่ กาแฟ น้ำเชื่อมยูซุ และโซดา Pepsi, Coffee, Yuzu and Soda - 12-99-05-0061 - bn_cursed_coffee.png - - - - คุณยายท้ายหมู่บ้าน The Haunting Hag of village เป๊ปซี่ น้ำเชื่อมบ๊วย ผงชาไทย และโซดา Pepsi, Plum, Thai Tea and Soda - 12-99-05-0062 - bn_haunting_hag_of_village.png - - - - คำเตือนของซาตาน Jasmine Jinx เป๊ปซี่ ชามะลิ น้ำเชื่อมยูซุ ผงมะนาว และโซดา Pepsi Jasmine Yuzu and Soda - 12-99-05-0063 - bn_jasmin_jinx.png - - - + คุณยายท้ายหมู่บ้าน The Haunting\nHag of village เป๊ปซี่ น้ำเชื่อมบ๊วย ผงชาไทย และโซดา Pepsi, Plum, Thai Tea and Soda - 12-99-05-0062 - bn_haunting_hag_of_village.png - - - อาถรรพ์คืนวันพุธ Midnight's Enigma เป๊ปซี่ น้ำเชื่อมบ๊วย ผงมะนาว และโซดา Pepsi Plum Lime and Soda - 12-99-05-0064 - bn_midnight_enigma.png - - - ล้า ท้า หลอน Unbelievers' Demise เป๊ปซี่ ชามะลิ น้ำเชื่อมเมล่อน และโซดา Pepsi Jasmine Melon and Soda - 12-99-05-0065 - bn_unbelievers_demise.png - - - ดิน 7 ป่าช้า 7 Haunted Woods ? (เป๊ปซี่ นม และโอริโอ้ ) ? (pepsi oreo) - - 12-99-03-0066 bn_haunted_woods.png - - - @@ -441,3 +440,4 @@ Name=Obsolete,file=page_obsolete.skt โฮจิฉะ HOJICHA ชาเขียวคั่ว Hojicha 12-02-01-0036 12-02-02-0036 12-02-03-0036 bn_hot_hojicha_tea_sing.png #N/A #N/A #N/A #N/A #N/A บลูเบอร์รี่โปรตีน BLUEBERRY SHAKE เวย์โปรตีน นม \nน้ำเชื่อมบลูเบอร์รี่ Whey protein,\nBlueberry Syrup & Milk - 12-04-02-0007 - bn_protein_Blueberry.png - #N/A - #N/A #N/A โตเกียวบานาน่าโปรตีน BANANA SHAKE เวย์โปรตีน นม \nน้ำเชื่อมโตเกียวบานาน่า Whey protein, Milk,\nTokyo Banana syrup - 12-04-02-0019 - bn_protein_Banana.png - - - - ฿65.00 - NN NN + คำเตือนของซาตาน Jasmine Jinx เป๊ปซี่ ชามะลิ น้ำเชื่อมยูซุ ผงมะนาว และโซดา Pepsi Jasmine Yuzu and Soda - 12-99-05-0063 - bn_jasmin_jinx.png - - - diff --git a/xml/event/pepween/page_collect_point_pro_pepween_2.xml b/xml/event/pepween/page_collect_point_pro_pepween_2.xml index 866117c8..34377756 100644 --- a/xml/event/pepween/page_collect_point_pro_pepween_2.xml +++ b/xml/event/pepween/page_collect_point_pro_pepween_2.xml @@ -158,46 +158,125 @@ Var PopweenPointNewIndex = 0 - If Seeker.ProductCode = "12-99-05-0053" Then - Var PopweenPointNewIndex = 0 + If Seeker.selected_a_drink = "12-99-05-0053" Then + If PopweenPointState[0] = 1 Then + Var PopweenPointNewIndex = "" + Else + Var PopweenPointNewIndex = 0 + EndIf + + Var PopweenPointState[0] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0054" Then - Var PopweenPointNewIndex = 1 + If Seeker.selected_a_drink = "12-99-05-0054" Then + If PopweenPointState[1] = 1 Then + Var PopweenPointNewIndex = "" + Else + Var PopweenPointNewIndex = 1 + EndIf + + Var PopweenPointState[1] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0055" Then - Var PopweenPointNewIndex = 2 + If Seeker.selected_a_drink = "12-99-05-0055" Then + If PopweenPointState[2] = 1 Then + Var PopweenPointNewIndex = "" + Else + Var PopweenPointNewIndex = 2 + EndIf + + Var PopweenPointState[2] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0057" Then - Var PopweenPointNewIndex = 3 + If Seeker.selected_a_drink = "12-99-05-0057" Then + If PopweenPointState[3] = 1 Then + Var PopweenPointNewIndex = "" + Else + Var PopweenPointNewIndex = 3 + EndIf + + Var PopweenPointState[3] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0058" Then - Var PopweenPointNewIndex = 4 + If Seeker.selected_a_drink = "12-99-05-0058" Then + If PopweenPointState[4] = 1 Then + Var PopweenPointNewIndex = "" + Else + Var PopweenPointNewIndex = 4 + EndIf + Var PopweenPointState[4] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0059" Then - Var PopweenPointNewIndex = 5 + If Seeker.selected_a_drink = "12-99-05-0059" Then + If PopweenPointState[5] = 1 Then + Var PopweenPointNewIndex = "" + Else + Var PopweenPointNewIndex = 5 + EndIf + + Var PopweenPointState[5] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0060" Then - Var PopweenPointNewIndex = 6 + If Seeker.selected_a_drink = "12-99-05-0060" Then + If PopweenPointState[6] = 1 Then + Var PopweenPointNewIndex = "" + Else + Var PopweenPointNewIndex = 6 + EndIf + + Var PopweenPointState[6] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0061" Then - Var PopweenPointNewIndex = 7 + If Seeker.selected_a_drink = "12-99-05-0061" Then + If PopweenPointState[7] = 1 Then + Var PopweenPointNewIndex = "" + Else + Var PopweenPointNewIndex = 7 + EndIf + Var PopweenPointState[7] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0062" Then - Var PopweenPointNewIndex = 8 + If Seeker.selected_a_drink = "12-99-05-0062" Then + If PopweenPointState[8] = 1 Then + Var PopweenPointNewIndex = "" + Else + Var PopweenPointNewIndex = 8 + EndIf + + Var PopweenPointState[8] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0064" Then - Var PopweenPointNewIndex = 9 + If Seeker.selected_a_drink = "12-99-05-0064" Then + If PopweenPointState[9] = 1 Then + Var PopweenPointNewIndex = "" + Else + Var PopweenPointNewIndex = 9 + EndIf + + Var PopweenPointState[9] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0065" Then - Var PopweenPointNewIndex = 10 + If Seeker.selected_a_drink = "12-99-05-0065" Then + If PopweenPointState[10] = 1 Then + Var PopweenPointNewIndex = "" + Else + Var PopweenPointNewIndex = 10 + EndIf + + Var PopweenPointState[10] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0056" Then - Var PopweenPointNewIndex = 11 + If Seeker.selected_a_drink = "12-99-05-0056" Then + If PopweenPointState[11] = 1 Then + Var PopweenPointNewIndex = "" + Else + Var PopweenPointNewIndex = 11 + EndIf + + Var PopweenPointState[11] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0066" Then - Var PopweenPointNewIndex = 11 + If Seeker.selected_a_drink = "12-99-03-0066" Then + If PopweenPointState[12] = 1 Then + Var PopweenPointNewIndex = "" + Else + Var PopweenPointNewIndex = 12 + EndIf + + Var PopweenPointState[12] = 1 EndIf + DEBUGVAR Seeker.selected_a_drink + DEBUGVAR PopweenPointNewIndex + DEBUGVAR Seeker.PointTaobinStr DEBUGVAR Seeker.TNumberTaobinMember If TaobinPDPA = 0 Then diff --git a/xml/event/pepween/page_collect_point_pro_pepween_3.xml b/xml/event/pepween/page_collect_point_pro_pepween_3.xml index a628375b..3a6bae15 100644 --- a/xml/event/pepween/page_collect_point_pro_pepween_3.xml +++ b/xml/event/pepween/page_collect_point_pro_pepween_3.xml @@ -20,6 +20,7 @@ ;Add after pay Var PointMaskState = "Invisible" + Var showRandomBtnState = "Invisible" Var CoffeePointStr = CoffeePoint @@ -42,31 +43,6 @@ Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" Var ThaiTextState = "Enable" EndIf - - Var CoffeePointTmp = CoffeePoint - - ;If CoffeePoint > 12 Then - ; Var Timeout = 18 - ; Var CoffeePointTmp = 13 - ;EndIf - - If CoffeePoint < 17 Then - Var CoffeePointTmp = 1 - Else - Var CoffeePointTmp = CoffeePoint - 17 - EndIf - - Var PointDiff = 13 - CoffeePointTmp - - If show_eng = "true" Then - Var TaobinLevelDesc1 = "You're just " + PointDiff - Var TaobinLevelDesc1 = TaobinLevelDesc1 + " menu item away from unlocking a Secret graveyard prize." - Var TaobinLevelDesc2 = "Collect all 13 horrifying menus now!" - Else - Var TaobinLevelDesc1 = "เหลืออีก " + PointDiff - Var TaobinLevelDesc1 = TaobinLevelDesc1 + " เมนูที่จะเปิดล็อคความน่าสะพรึง" - Var TaobinLevelDesc2 = "สะสมให้ครบ 13 เมนูแสนอร่อยปนความสยองตอนนี้เลย!" - EndIf Var CheckCoupons = 0 Var MakeDrinkState = 0 @@ -102,33 +78,33 @@ Var taobinImgPoint[11] = "/skull_active.png" Var taobinImgPoint[12] = "/skull_active.png" - Var taobinTextPoint[0].Thai = "พระจันทร์สีเลือด" - Var taobinTextPoint[1].Thai = "สุภาพสตรีสีขาว" - Var taobinTextPoint[2].Thai = "เสียงดนตรีตอนตี 3" - Var taobinTextPoint[3].Thai = "พยาบาทชาติที่แล้ว" - Var taobinTextPoint[4].Thai = "ท่านเคาท์เขย่าขวัญ" - Var taobinTextPoint[5].Thai = "ห้องเชือดหมายเลข 13" - Var taobinTextPoint[6].Thai = "ค่ำคืนคอยหลอน" - Var taobinTextPoint[7].Thai = "แม่ชีไร้หัว" - Var taobinTextPoint[8].Thai = "คุณยายท้ายหมู่บ้าน" - Var taobinTextPoint[9].Thai = "อาถรรพ์คืนวันพุธ" - Var taobinTextPoint[10].Thai = "ล้า ท้า หลอน" - Var taobinTextPoint[11].Thai = "หมอกควันแห่งความมืด" - Var taobinTextPoint[12].Thai = "ดิน 7 ป่าช้า" + Var taobinTextPointTH[0] = "พระจันทร์สีเลือด" + Var taobinTextPointTH[1] = "สุภาพสตรีสีขาว" + Var taobinTextPointTH[2] = "เสียงดนตรีตอนตี 3" + Var taobinTextPointTH[3] = "พยาบาทชาติที่แล้ว" + Var taobinTextPointTH[4] = "ท่านเคาท์เขย่าขวัญ" + Var taobinTextPointTH[5] = "ห้องเชือดหมายเลข 13" + Var taobinTextPointTH[6] = "ค่ำคืนคอยหลอน" + Var taobinTextPointTH[7] = "แม่ชีไร้หัว" + Var taobinTextPointTH[8] = "คุณยายท้ายหมู่บ้าน" + Var taobinTextPointTH[9] = "อาถรรพ์คืนวันพุธ" + Var taobinTextPointTH[10] = "ล้า ท้า หลอน" + Var taobinTextPointTH[11] = "หมอกควันแห่งความมืด" + Var taobinTextPointTH[12] = "ดิน 7 ป่าช้า" - Var taobinTextPoint[0].Eng = "Red Moon" - Var taobinTextPoint[1].Eng = "White Lady" - Var taobinTextPoint[2].Eng = "Mysterious music box" - Var taobinTextPoint[3].Eng = "Haunted Haze" - Var taobinTextPoint[4].Eng = "The dark lord" - Var taobinTextPoint[5].Eng = "Room no.13" - Var taobinTextPoint[6].Eng = "Haunted Harvest" - Var taobinTextPoint[7].Eng = "Cursed Coffee" - Var taobinTextPoint[8].Eng = "The Haunting Hag of village" - Var taobinTextPoint[9].Eng = "Midnight's Enigma" - Var taobinTextPoint[10].Eng = "Unbelievers' Demise" - Var taobinTextPoint[11].Eng = "Haunted Haze" - Var taobinTextPoint[12].Eng = "7 Haunted Woods" + Var taobinTextPointEN[0] = "Red Moon" + Var taobinTextPointEN[1] = "White Lady" + Var taobinTextPointEN[2] = "Mysterious music box" + Var taobinTextPointEN[3] = "Haunted Haze" + Var taobinTextPointEN[4] = "The dark lord" + Var taobinTextPointEN[5] = "Room no.13" + Var taobinTextPointEN[6] = "Haunted Harvest" + Var taobinTextPointEN[7] = "Cursed Coffee" + Var taobinTextPointEN[8] = "The Haunting Hag of village" + Var taobinTextPointEN[9] = "Midnight's Enigma" + Var taobinTextPointEN[10] = "Unbelievers' Demise" + Var taobinTextPointEN[11] = "Haunted Haze" + Var taobinTextPointEN[12] = "7 Haunted Woods" Var taobinTextColorPoint[0] = "0xFFFFFF" Var taobinTextColorPoint[1] = "0xFFFFFF" @@ -144,50 +120,84 @@ Var taobinTextColorPoint[11] = "0xFFFFFF" Var taobinTextColorPoint[12] = "0xFFFFFF" + Var PepweenPoint = 0 If PopweenPointState[0] = 1 Then Var taobinP1 = "Enable" + Var PepweenPoint = PepweenPoint + 1 EndIf If PopweenPointState[1] = 1 Then Var taobinP2 = "Enable" + Var PepweenPoint = PepweenPoint + 1 EndIf If PopweenPointState[2] = 1 Then Var taobinP3 = "Enable" + Var PepweenPoint = PepweenPoint + 1 EndIf If PopweenPointState[3] = 1 Then Var taobinP4 = "Enable" + Var PepweenPoint = PepweenPoint + 1 EndIf If PopweenPointState[4] = 1 Then Var taobinP5 = "Enable" + Var PepweenPoint = PepweenPoint + 1 EndIf If PopweenPointState[5] = 1 Then Var taobinP6 = "Enable" + Var PepweenPoint = PepweenPoint + 1 EndIf If PopweenPointState[6] = 1 Then Var taobinP7 = "Enable" + Var PepweenPoint = PepweenPoint + 1 EndIf If PopweenPointState[7] = 1 Then Var taobinP8 = "Enable" + Var PepweenPoint = PepweenPoint + 1 EndIf If PopweenPointState[8] = 1 Then Var taobinP9 = "Enable" + Var PepweenPoint = PepweenPoint + 1 EndIf If PopweenPointState[9] = 1 Then Var taobinP10 = "Enable" + Var PepweenPoint = PepweenPoint + 1 EndIf If PopweenPointState[10] = 1 Then Var taobinP11 = "Enable" + Var PepweenPoint = PepweenPoint + 1 EndIf If PopweenPointState[11] = 1 Then Var taobinP12 = "Enable" + Var PepweenPoint = PepweenPoint + 1 EndIf If PopweenPointState[12] = 1 Then Var taobinP13 = "Enable" + Var PepweenPoint = PepweenPoint + 1 EndIf - If PopweenPointNewIndex >= 0 Then - Var taobinImgPoint[PopweenPointNewIndex] = "/skull_active_new.png" - Var taobinTextColorPoint[PopweenPointNewIndex] = "0xE97A13" + If PopweenPointNewIndex = "" Then + ; Nothing + Else + If PopweenPointNewIndex >= 0 Then + Var taobinImgPoint[PopweenPointNewIndex] = "/skull_active_new.png" + Var taobinTextColorPoint[PopweenPointNewIndex] = "0xE97A13" + EndIf + EndIf + + Var PointDiff = 13 - PepweenPoint + + If show_eng = "true" Then + Var TaobinLevelDesc1 = "You're just " + PointDiff + Var TaobinLevelDesc1 = TaobinLevelDesc1 + " menu item away from unlocking a Secret graveyard prize." + Var TaobinLevelDesc2 = "Collect all 13 horrifying menus now!" + Else + Var TaobinLevelDesc1 = "เหลืออีก " + PointDiff + Var TaobinLevelDesc1 = TaobinLevelDesc1 + " เมนูที่จะเปิดล็อคความน่าสะพรึง" + Var TaobinLevelDesc2 = "สะสมให้ครบ 13 เมนูแสนอร่อยปนความสยองตอนนี้เลย!" + EndIf + + If PepweenPoint = 13 Then + Var showRandomBtnState = "Enable" EndIf If Seeker = "curr" Then @@ -196,15 +206,8 @@ Var CheckCouponState = "Disable" EndIf - Var CurrentPointSlot = "10" - Var CurrentPointCheck = "" - Var val3 = "X" - AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3 - -; Var CodeType = "114" -; Var val2 = "X" -; Var val3 = "X" -; AddData 36 TelephoneNumber CodeType val2 val3 + Var CurrentPointSlot = PopweenPointNewIndex + 1 + 1000 @@ -216,24 +219,11 @@ Var Timeout = Timeout + 1 - If Timeout > 5 Then - - ; goto lid straw - If CoffeePoint > 29 Then - Open "ROOT/taobin_project/xml/page_display_get_free.xml" - Else - If Seeker.FromConsent = 1 Then - Open "ROOT/taobin_project/xml/page_display_get_free.xml" - Else - - If PromotionIDCurrentOrder > 1 Then - Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml" - EndIf - - Open "ROOT/taobin_project/xml/page_lid_straw.xml" - EndIf - - EndIf + If Timeout > 10 Then + Var CurrentPointCheck = "check" + Var val3 = "X" + AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3 + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf @@ -243,46 +233,11 @@ - - - + Open "/media/bt/xml/security_alarm.xml" - - If CheckCoupons = 1 Then - Var MakeDrinkState = 1 - Var CouponPage = 1 - Var CouponInfo1 = Ext1a - Var CouponInfo2 = Ext1b - Var CouponInfo3 = Ext1c - Var CouponInfo4 = Ext1d - Var CouponInfo5 = Ext1e - Var CouponInfo6 = Ext1f - Var CouponInfo7 = Ext1g - Var CouponInfo8 = Ext1h - Var CouponInfo9 = Ext1i - Var CouponInfo10 = Ext1j - - Var TelephoneNumber = TelephoneNumberX - GETACCEXT TelephoneNumber 13 - Var CheckCoupons = 2 - - Else - - If CheckCoupons = 2 Then - - Var TaobinCredit = Ext1b - Open "ROOT/taobin_project/xml/page_check_member2.xml" - - EndIf - - EndIf - - - - If MachineStage = "drink-success" Then @@ -364,6 +319,7 @@ @@ -189,6 +214,31 @@ ; Send to server + Var CodeType = "" + Var var2 = "X" + Var var3 = "X" + + If UserCouponReward = "dis30" Then + Var CodeType = "115" + EndIf + + If UserCouponReward = "dis50" Then + Var CodeType = "116" + EndIf + + If UserCouponReward = "dis100" Then + Var CodeType = "114" + EndIf + + ; Empty Random + ;If CodeType = "" Then + ; ; TODO: Handle just in case + ;Else + ; + ;EndIf + + AddData 36 TelephoneNumber CodeType var2 var3 + Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml" @@ -210,6 +260,31 @@ ; Send to server + Var CodeType = "" + Var var2 = "X" + Var var3 = "X" + + If UserCouponReward = "dis30" Then + Var CodeType = "115" + EndIf + + If UserCouponReward = "dis50" Then + Var CodeType = "116" + EndIf + + If UserCouponReward = "dis100" Then + Var CodeType = "114" + EndIf + + ; Empty Random + ;If CodeType = "" Then + ; ; TODO: Handle just in case + ;Else + ; + ;EndIf + + AddData 36 TelephoneNumber CodeType var2 var3 + Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml" @@ -231,6 +306,31 @@ ; Send to server + Var CodeType = "" + Var var2 = "X" + Var var3 = "X" + + If UserCouponReward = "dis30" Then + Var CodeType = "115" + EndIf + + If UserCouponReward = "dis50" Then + Var CodeType = "116" + EndIf + + If UserCouponReward = "dis100" Then + Var CodeType = "114" + EndIf + + ; Empty Random + ;If CodeType = "" Then + ; ; TODO: Handle just in case + ;Else + ; + ;EndIf + + AddData 36 TelephoneNumber CodeType var2 var3 + Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml" @@ -252,6 +352,31 @@ ; Send to server + Var CodeType = "" + Var var2 = "X" + Var var3 = "X" + + If UserCouponReward = "dis30" Then + Var CodeType = "115" + EndIf + + If UserCouponReward = "dis50" Then + Var CodeType = "116" + EndIf + + If UserCouponReward = "dis100" Then + Var CodeType = "114" + EndIf + + ; Empty Random + ;If CodeType = "" Then + ; ; TODO: Handle just in case + ;Else + ; + ;EndIf + + AddData 36 TelephoneNumber CodeType var2 var3 + Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml" diff --git a/xml/event/pepween/page_pepween_result.xml b/xml/event/pepween/page_pepween_result.xml index 94ec2a6b..67c382cd 100644 --- a/xml/event/pepween/page_pepween_result.xml +++ b/xml/event/pepween/page_pepween_result.xml @@ -29,35 +29,16 @@ DEBUGVAR Timeout - If PayOfflineMode = 1 Then - Var ServerRespond = 0 - Var CouponResponeFailed = 1 - EndIf - If Timeout > 60 Then + + If Timeout > 5 Then ; Check and return Error - Var CouponResponeFailed = 1 - Open "ROOT/taobin_project/xml/event/pepween/page_pepween_error.xml" + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf Var Timeout = Timeout + 1 TimerReset - - - If CouponResponeFailed = 0 Then - ; TODO: - ;Open "ROOT/taobin_project/xml/event/pepween/page_pepween_error.xml" - EndIf - - - - - ; TODO: open coupon send error page - If CouponResponeFailed = 1 Then - Open "ROOT/taobin_project/xml/event/pepween/page_pepween_error.xml" - EndIf -