diff --git a/image/event/bad_valentine/display_point_en/bn_random.png b/image/event/bad_valentine/display_point_en/bn_random.png new file mode 100644 index 00000000..a3fe857c Binary files /dev/null and b/image/event/bad_valentine/display_point_en/bn_random.png differ diff --git a/image/event/bad_valentine/display_point_en/bp_random.png b/image/event/bad_valentine/display_point_en/bp_random.png new file mode 100644 index 00000000..3a0e33e9 Binary files /dev/null and b/image/event/bad_valentine/display_point_en/bp_random.png differ diff --git a/image/page_doing/brewing_txt_adv4.png b/image/page_doing/brewing_txt_adv4.png index 4dbba152..3cee0ccd 100644 Binary files a/image/page_doing/brewing_txt_adv4.png and b/image/page_doing/brewing_txt_adv4.png differ diff --git a/image/page_doing/brewing_txt_adv4_en.png b/image/page_doing/brewing_txt_adv4_en.png index 49e6b348..caec6f84 100644 Binary files a/image/page_doing/brewing_txt_adv4_en.png and b/image/page_doing/brewing_txt_adv4_en.png differ diff --git a/image/page_drink_disable_n2/bn_Choco_banana_smoothie.png b/image/page_drink_disable_n2/bn_Choco_banana_smoothie.png new file mode 100644 index 00000000..30df3776 Binary files /dev/null and b/image/page_drink_disable_n2/bn_Choco_banana_smoothie.png differ diff --git a/image/page_drink_disable_n2/bn_Choco_straw_banana_smoothie.png b/image/page_drink_disable_n2/bn_Choco_straw_banana_smoothie.png deleted file mode 100644 index 122114b1..00000000 Binary files a/image/page_drink_disable_n2/bn_Choco_straw_banana_smoothie.png and /dev/null differ diff --git a/image/page_drink_disable_n2/bn_iced_milk_TokyoBanana.png b/image/page_drink_disable_n2/bn_iced_milk_TokyoBanana.png new file mode 100644 index 00000000..3e810718 Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_milk_TokyoBanana.png differ diff --git a/image/page_drink_n/bn_Choco_banana_smoothie.png b/image/page_drink_n/bn_Choco_banana_smoothie.png new file mode 100644 index 00000000..a1db920e Binary files /dev/null and b/image/page_drink_n/bn_Choco_banana_smoothie.png differ diff --git a/image/page_drink_n/bn_Choco_straw_banana_smoothie.png b/image/page_drink_n/bn_Choco_straw_banana_smoothie.png deleted file mode 100644 index 92c9ed41..00000000 Binary files a/image/page_drink_n/bn_Choco_straw_banana_smoothie.png and /dev/null differ diff --git a/image/page_drink_n/bn_iced_milk_TokyoBanana.png b/image/page_drink_n/bn_iced_milk_TokyoBanana.png new file mode 100644 index 00000000..3166ff6b Binary files /dev/null and b/image/page_drink_n/bn_iced_milk_TokyoBanana.png differ diff --git a/image/page_drink_picture2_n/bn_Choco_banana_smoothie.png b/image/page_drink_picture2_n/bn_Choco_banana_smoothie.png new file mode 100644 index 00000000..3113ac2d Binary files /dev/null and b/image/page_drink_picture2_n/bn_Choco_banana_smoothie.png differ diff --git a/image/page_drink_picture2_n/bn_Choco_straw_banana_smoothie.png b/image/page_drink_picture2_n/bn_Choco_straw_banana_smoothie.png deleted file mode 100644 index ba7f9448..00000000 Binary files a/image/page_drink_picture2_n/bn_Choco_straw_banana_smoothie.png and /dev/null differ diff --git a/image/page_drink_picture2_n/bn_iced_milk_TokyoBanana.png b/image/page_drink_picture2_n/bn_iced_milk_TokyoBanana.png new file mode 100644 index 00000000..aabd8355 Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_milk_TokyoBanana.png differ diff --git a/image/page_drink_press_n/bn_Choco_banana_smoothie.png b/image/page_drink_press_n/bn_Choco_banana_smoothie.png new file mode 100644 index 00000000..52b53167 Binary files /dev/null and b/image/page_drink_press_n/bn_Choco_banana_smoothie.png differ diff --git a/image/page_drink_press_n/bn_Choco_straw_banana_smoothie.png b/image/page_drink_press_n/bn_Choco_straw_banana_smoothie.png deleted file mode 100644 index cc725b03..00000000 Binary files a/image/page_drink_press_n/bn_Choco_straw_banana_smoothie.png and /dev/null differ diff --git a/image/page_drink_press_n/bn_iced_milk_TokyoBanana.png b/image/page_drink_press_n/bn_iced_milk_TokyoBanana.png new file mode 100644 index 00000000..68543d29 Binary files /dev/null and b/image/page_drink_press_n/bn_iced_milk_TokyoBanana.png differ diff --git a/image/topping2/sugar_type_option.png b/image/topping2/sugar_type_option.png new file mode 100644 index 00000000..0f52ad4d Binary files /dev/null and b/image/topping2/sugar_type_option.png differ diff --git a/image/topping2_en/sugar_type_option.png b/image/topping2_en/sugar_type_option.png new file mode 100644 index 00000000..32a3a83a Binary files /dev/null and b/image/topping2_en/sugar_type_option.png differ diff --git a/inter/aus/xml/page_brewing3.lxml b/inter/aus/xml/page_brewing3.lxml index 1537bc8a..fcd0805b 100644 --- a/inter/aus/xml/page_brewing3.lxml +++ b/inter/aus/xml/page_brewing3.lxml @@ -332,8 +332,8 @@ Var SelectMenuBetweenBrewEnable1 = "Invisible" EndIf - Var SelectMenuBetweenBrewEnable1Blink = "Invisible" - Var SelectMenuBetweenBrewEnable1 = "Invisible" + ;Var SelectMenuBetweenBrewEnable1Blink = "Invisible" + ;Var SelectMenuBetweenBrewEnable1 = "Invisible" DEBUGVAR NeedUpgrade DEBUGVAR NeedReboot diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index ed9e20c9..9031b081 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -145,7 +145,7 @@ Name=Milk,file=page_catalog_group_milk.skt นมบราวน์ชูการ์ BROWN SUGAR \nMILK นม และ น้ำเชื่อมน้ำตาลแดง Milk, Kokuto syrup 12-03-01-0003 12-03-02-0003 12-03-03-0003 bn_iced_Black_Sugar_Milk.png - - - posi1 ฿35.00 ฿40.00 ฿45.00 TRUE TRUE - - - นมชมพู PINK MILK น้ำแดงกลิ่นสละ นม \nน้ำตาล Salak Syrup, Milk, Sugar - 12-03-02-0006 12-03-03-0006 bn_pink_milk.png - - - posi1 - ฿35.00 ฿40.00 NN TRUE - IGNORE BANANA MILK 12-03-01-0023 12-03-02-0023 12-03-03-0023 bn_Banana_milk.png posi1 ฿30.00 ฿35.00 ฿40.00 TRUE TRUE + นมโตเกียวบานาน่า TOKYO BANANA MILK น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล Tokyo Banana Syrup, Milk, Sugar 12-03-01-0023 12-03-02-0023 12-03-03-0023 bn_Banana_milk.png posi1 ฿30.00 ฿35.00 ฿40.00 TRUE TRUE โกโก้ 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 - - - โกโก้สตอเบอร์รี่ปั่น STRAWCOCOA \nSMOOTHIE นม น้ำเชื่อมสตอเบอร์รี่ \nโกโก้ และน้ำแข็ง Milk, Cocoa, Strawberry Syrup - - 12-03-03-0010 bn_iced_strawberrycocoa_smoothie.png - - - posi1 - - ฿45.00 NN NN @@ -546,19 +546,19 @@ Name=Peach,file=page_catalog_group_pro_peach.skt Name=BadValentine,file=page_catalog_group_pro_bad_valentine.skt เป็นเด็กดื้อโดนตีเป็น\nเด็กดีโดนทิ้งตลอด Bad kids smacked\ngood ones ditched กาแฟ น้ำ นม โกโก้ และ น้ำเชื่อมกล้วย Espresso, Banana Syrup,\ncocoa, Milk - 12-01-02-0061 12-01-03-0061 bn_iced_Mocha_Tokyobanana_smoothie.png - 12-21-02-0061 12-21-03-0061 posi1 ตัดบทบอกฝันดี\n= เขาไม่อยากคุย Ghosted after night\nconvo's dead กาแฟ น้ำ นม มัทฉะ และ น้ำเชื่อมกล้วย Espresso, Banana Syrup,\nMatcha, Milk - 12-01-02-0062 - bn_iced_matcha_Latte_TokyoBanana.png - 12-21-02-0062 - posi1 - ที่ทำดีด้วยเขาไม่ได้มีใจ\nแต่เขามีเมตตา Kindness fix,\nzero romance drama. น้ำเชื่อมกล้วย น้ำเชื่อมสตรอเบอร์รี่ นม และโกโก้ banana syrup, Strawberry syrup,\nMilk, cocoa - - 12-03-03-0044 bn_Choco_straw_banana_smoothie.png - - - posi1 + ที่ทำดีด้วยเขาไม่ได้มีใจ\nแต่เขามีเมตตา Kindness fix,\nzero romance drama. น้ำเชื่อมกล้วย นม และโกโก้ และน้ำ banana syrup,\nMilk, cocoa - 12-03-02-0024 12-03-03-0024 bn_Choco_straw_banana_smoothie.png - - - posi1 ตกอยู่ในสถานะ\nสแตนด์บาย Love on mute,\nstuck in suspense. น้ำเชื่อมกล้วย น้ำเชื่อมสตรอเบอร์รี่ และนม banana syrup, Strawberry syrup,\nMilk - - 12-03-03-0045 bn_iced_strawberry_Tokyobanana_smoothie.png - - - posi1 บอกว่าคุยได้\nพอทักไปก็หาย Promised a chat, but\npoof,gone after HEY. น้ำเชื่อมกล้วย นม น้ำตาล Oreo Banana Syrup, Milk,\nSugar, Oreo - - 12-03-03-0029 bn_BananaOreo_smoothie_bad_valentine.png - - - posi1 เขาจะกลับมาก็ต่อเมื่อ\nไม่เหลือใคร Pops up when the\nrest bail on you. น้ำเชื่อมกล้วย ขิง และน้ำแข็ง Banana Syrup, Ginger and Ice - 12-02-02-0053 - bn_iced_Ginger_TokyoBanana.png - - - posi1 รักหมดใจ\nเจ็บหมดตัวมีอยู่จริง Love deep, broke\nhard–the real deal. น้ำเชื่อมกล้วย ชาไทย นม และน้ำแข็ง Banana Syrup, Thai tea, milk and Ice - 12-02-02-0054 - bn_iced_ThaiTea_TokyoBanana.png - - - posi1 - คนลืมก่อนชนะ\nโอเคเราแพ้ Forget love, take\nthe L น้ำเชื่อมกล้วย มัทฉะ และน้ำแข็ง Banana Syrup, Matcha and Ice - 12-02-02-0055 - bn_iced_matcha_TokyoBanana.png - - - posi1 + คนลืมก่อนชนะ\nโอเคเราแพ้ Forget love, take\nthe L น้ำเชื่อมกล้วย นม และน้ำแข็ง Banana Syrup, milk and Ice - 12-03-02-0023 12-03-03-0023 bn_iced_matcha_TokyoBanana.png - - - posi1 แชมป์โอลิมปิก\nสาขาชวนคุย Chat's our sport,\ngold in NO REPLY น้ำเชื่อมกล้วย เต่าทรงพลัง \n(มีคาเฟอีน) Banana Syrup, Medicine drink, Soda and Ice - 12-05-02-0078 - bn_iced_energy_drink_Banana_soda.png - - - posi1 Name=Lip It น้ำเชื่อมคาราเมล น้ำเชื่อมบ๊วย นมและน้ำแข็ง Caramel Syrup, Plum Syrup, Milk and Ice - - 12-03-03-0046 น้ำเชื่อมคาราเมล น้ำเชื่อมสตรอเบอร์รี่ นมและน้ำแข็ง Straw Syrup, Caramel Syrup, Milk and Ice - - 12-03-03-0047 - น้ำเชื่อมยูซุ ชามะลิ เป๊ปซี่ และโซดา Pepsi, Jasmine Tea, Yuzu Syrup, Soda and Ice - 12-05-02-0079 - + น้ำเชื่อมยูซุ ชามะลิ เป๊ปซี่ และโซดา Pepsi, Jasmine Tea, Yuzu Syrup, Soda and Ice - 12-99-02-0063 - น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมกล้วย โกโก้ นมและน้ำแข็ง Cocoa, Straw Syrup, Banana Syrup, Milk and Ice - 12-03-02-0040 - น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมยูซุ น้ำและน้ำแข็ง Strawberry Syrup, Yuzu Syrup, \nWater - - 12-05-03-0063 น้ำเชื่อมลิ้นจี่ น้ำเชื่อมสละ น้ำและน้ำแข็ง Lychee Syrup, Salak Syrup, \nWater - 12-05-02-0080 - diff --git a/video/brewing_adv4.mp4 b/video/brewing_adv4.mp4 old mode 100755 new mode 100644 index b1e772b7..f1b61a4b Binary files a/video/brewing_adv4.mp4 and b/video/brewing_adv4.mp4 differ diff --git a/video/brewing_txt_adv4.png b/video/brewing_txt_adv4.png index 4dbba152..3cee0ccd 100644 Binary files a/video/brewing_txt_adv4.png and b/video/brewing_txt_adv4.png differ diff --git a/video/brewing_txt_adv4_en.png b/video/brewing_txt_adv4_en.png index 49e6b348..caec6f84 100644 Binary files a/video/brewing_txt_adv4_en.png and b/video/brewing_txt_adv4_en.png differ diff --git a/video/script3_brew.ev b/video/script3_brew.ev index 4fd1569c..30c69718 100644 --- a/video/script3_brew.ev +++ b/video/script3_brew.ev @@ -2,12 +2,14 @@ ; Need var brew_txt2 -If TeaserBottleEnable = 1 Then +DEBUGVAR ProBadValentineEnable + +If ProBadValentineEnable = 1 Then GetFileSizeK "taobin_project/video/brewing_adv4.mp4" brewing_adv_size DEBUGVAR brewing_adv_size - If brewing_adv_size = 18433289 Then + If brewing_adv_size = 8235871 Then Var adver_brewing_play_index = 1 Var adver_brewing_count_down = 16 diff --git a/video/sync_1.file b/video/sync_1.file index f23e5fd1..18385d3a 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,26 +1,25 @@ -total 152060 +total 124768 -rw-rw---- 1 root sdcard_rw 14292128 2022-12-29 13:13 brewing_adv1.mp4 -rw-rw---- 1 root sdcard_rw 9526548 2023-09-18 18:44 brewing_adv3.mp4 --rw-rw---- 1 root sdcard_rw 18433289 2023-10-27 16:00 brewing_adv4.mp4 +-rw-rw---- 1 root sdcard_rw 8235871 2024-02-12 17:46 brewing_adv4.mp4 -rw-rw---- 1 root sdcard_rw 23569 2023-09-18 18:44 brewing_txt_adv1.png -rw-rw---- 1 root sdcard_rw 28097 2023-09-18 18:44 brewing_txt_adv1_en.png -rw-rw---- 1 root sdcard_rw 30982 2023-09-18 18:44 brewing_txt_adv3.png -rw-rw---- 1 root sdcard_rw 35550 2023-09-18 18:44 brewing_txt_adv3_en.png --rw-rw---- 1 root sdcard_rw 35899 2023-11-14 13:51 brewing_txt_adv4.png --rw-rw---- 1 root sdcard_rw 34729 2023-11-14 13:51 brewing_txt_adv4_en.png --rw-rw---- 1 root sdcard_rw 6546655 2023-09-18 18:44 event_1.mp4 +-rw-rw---- 1 root sdcard_rw 32907 2024-02-12 22:37 brewing_txt_adv4.png +-rw-rw---- 1 root sdcard_rw 32092 2024-02-12 22:37 brewing_txt_adv4_en.png -rw-rw---- 1 root sdcard_rw 23054056 2023-09-18 18:44 event_2.mp4 -rw-rw---- 1 root sdcard_rw 8948565 2023-12-19 10:07 main_page_event.mp4 --rw-rw---- 1 root sdcard_rw 8679952 2022-09-28 02:41 main_page_event_alter.mp4 -rw-rw---- 1 root sdcard_rw 7185758 2023-05-23 11:02 main_page_event_en.mp4 -rw-rw---- 1 root sdcard_rw 636 2023-12-20 11:07 script1.ev -rw-rw---- 1 root sdcard_rw 309 2023-12-21 13:31 script2.ev --rw-rw---- 1 root sdcard_rw 495 2023-11-14 13:18 script3_brew.ev --rw-rw---- 1 root sdcard_rw 0 2023-12-18 05:11 sync_1.file +-rw-rw---- 1 root sdcard_rw 529 2024-02-12 22:40 script3_brew.ev +-rw-rw---- 1 root sdcard_rw 0 2024-02-12 22:34 sync_1.file +-rw-rw---- 1 root sdcard_rw 557065 2021-02-18 15:05 taobin_brewing.mov +-rw-rw---- 1 root sdcard_rw 920095 2021-02-18 15:05 taobin_drink_ok.mov -rw-rw---- 1 root sdcard_rw 4806758 2023-09-18 18:44 taobin_save_world1.mp4 -rw-rw---- 1 root sdcard_rw 6428830 2023-09-18 18:44 taobin_save_world2.mp4 -rw-rw---- 1 root sdcard_rw 4634942 2023-09-18 18:44 taobin_save_world3.mp4 -rw-rw---- 1 root sdcard_rw 2084830 2023-09-18 18:44 taobin_thank1.mp4 -rw-rw---- 1 root sdcard_rw 6749397 2023-12-21 13:15 taobin_thank1_event.mp4 --rw-rw---- 1 root sdcard_rw 3999239 2022-09-27 02:04 taobin_thank1_event_alter.mp4 -rw-rw---- 1 root sdcard_rw 1631940 2023-09-18 18:44 taobin_thank2.mp4 diff --git a/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_2.xml b/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_2.xml index a30d657f..0af854c6 100644 --- a/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_2.xml +++ b/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_2.xml @@ -215,7 +215,17 @@ ; Point 3 - If Seeker.selected_a_drink = "12-03-03-0044" Then + If Seeker.selected_a_drink = "12-03-02-0024" Then + If PointState[2] = 1 Then + Var newPointIndex = "" + Else + Var newPointIndex = 2 + EndIf + + Var PointState[2] = 1 + EndIf + + If Seeker.selected_a_drink = "12-03-03-0024" Then If PointState[2] = 1 Then Var newPointIndex = "" Else @@ -273,7 +283,16 @@ ; Point 8 - If Seeker.selected_a_drink = "12-02-02-0055" Then + If Seeker.selected_a_drink = "12-03-02-0023" Then + If PointState[7] = 1 Then + Var newPointIndex = "" + Else + Var newPointIndex = 7 + EndIf + Var PointState[7] = 1 + EndIf + + If Seeker.selected_a_drink = "12-03-03-0023" Then If PointState[7] = 1 Then Var newPointIndex = "" Else diff --git a/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_3.xml b/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_3.xml index f94fed21..891552d6 100644 --- a/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_3.xml +++ b/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_3.xml @@ -27,22 +27,15 @@ DEBUGVAR TelephoneNumber DEBUGVAR TelephoneNumberX - Var ThaiTextState = "Invisible" - Var EngTextState = "Invisible" - If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/event/bad_valentine/display_point_en" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" - Var EngTextState = "Enable" - Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png" Else Var DirImage = "ROOT/taobin_project/image/event/bad_valentine/display_point" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" - Var ThaiTextState = "Enable" - Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" EndIf @@ -61,39 +54,41 @@ Var taobinImgPoint[7]= "/point_deactive.png" Var taobinImgPoint[8]= "/point_deactive.png" - ;Var taobinTextPointTH[0] = "รวยข้ามคืน ตื่นมารวย" - ;Var taobinTextPointTH[1] = "รวยตาค้าง กระพริบตาบ้างก็ได้" - ;Var taobinTextPointTH[2] = "รวยจนหน้าชา อาม่ายังงง" - ;Var taobinTextPointTH[3] = "รวยจนช็อก! น็อคแล้วไหม" - ;Var taobinTextPointTH[4] = "รวยไม่รู้ล้ม เอาผมลงไหมล่ะ" - ;Var taobinTextPointTH[5] = "รวยนะคะรู้ยัง ถ้ายังก็รู้ซะ" - ;Var taobinTextPointTH[6] = "รวยล้นฟ้า เทวดาซัปพอร์ต" - ;Var taobinTextPointTH[7] = "รวยฟ้าผ่า เพราะลืมหลบฝน" - ;Var taobinTextPointTH[8] = "แสร้งว่ารวย ค่าหวยไม่จ่าย" + Var PointCount = 0 - ;Var taobinTextPointEN[0] = "Mint Cafe Latte" - ;Var taobinTextPointEN[1] = "Mintcano" - ;Var taobinTextPointEN[2] = "Matcha Latte Mint" - ;Var taobinTextPointEN[3] = "Cocoa Mint" - ;Var taobinTextPointEN[4] = "Mint Milk" - ;Var taobinTextPointEN[5] = "Strawberry Mint Milk" - ;Var taobinTextPointEN[6] = "Mint Oreo Volcano" - ;Var taobinTextPointEN[7] = "Mint Lime Soda" - ;Var taobinTextPointEN[8] = "Strawberry Mint Soda" + If show_eng = "true" Then + Var taobinTextPoint[0] = "Bad kids smacked\ngood ones ditched" + Var taobinTextPoint[1] = "Ghosted after night\nconvo's dead" + Var taobinTextPoint[2] = "Kindness fix,\nzero romance drama" + Var taobinTextPoint[3] = "Love on mute,\nstuck in suspense" + Var taobinTextPoint[4] = "Promised a chat,\nbut poof, gone after HEY" + Var taobinTextPoint[5] = "Pops up when the rest bail" + Var taobinTextPoint[6] = "Love deep, broke hard – the real deal" + Var taobinTextPoint[7] = "Forget love, take the L" + Var taobinTextPoint[8] = "Chat's our sport, gold in NO REPLY" + Else + Var taobinTextPoint[0] = "เป็นเด็กดื้อโดนตี เป็นเด็กดีโดนทิ้งตลอด" + Var taobinTextPoint[1] = "ตัดบทบอกฝันดี = เขาไม่อยากคุย" + Var taobinTextPoint[2] = "ที่ทำดีด้วยเขาไม่ได้มีใจ แต่เขามีเมตตา" + Var taobinTextPoint[3] = "ตกอยู่ในสถานะสแตนด์บาย" + Var taobinTextPoint[4] = "บอกว่าคุยได้พอทักไปก็หาย" + Var taobinTextPoint[5] = "เขาจะกลับมาก็ต่อเมื่อไม่เหลือใคร" + Var taobinTextPoint[6] = "รักหมดใจ เจ็บหมดตัวมีอยู่จริง" + Var taobinTextPoint[7] = "คนลืมก่อนชนะ โอเคเราแพ้" + Var taobinTextPoint[8] = "แชมป์โอลิมปิกสาขาชวนคุย" + EndIf - ;Var taobinTextColorPoint[0] = "0xFFFFFF" - ;Var taobinTextColorPoint[1] = "0xFFFFFF" - ;Var taobinTextColorPoint[2] = "0xFFFFFF" - ;Var taobinTextColorPoint[3] = "0xFFFFFF" - ;Var taobinTextColorPoint[4] = "0xFFFFFF" - ;Var taobinTextColorPoint[5] = "0xFFFFFF" - ;Var taobinTextColorPoint[6] = "0xFFFFFF" - ;Var taobinTextColorPoint[7] = "0xFFFFFF" - ;Var taobinTextColorPoint[8] = "0xFFFFFF" - - Var PointCount = 0 + Var taobinTextColorPoint[0] = "0x000000" + Var taobinTextColorPoint[1] = "0x000000" + Var taobinTextColorPoint[2] = "0x000000" + Var taobinTextColorPoint[3] = "0x000000" + Var taobinTextColorPoint[4] = "0x000000" + Var taobinTextColorPoint[5] = "0x000000" + Var taobinTextColorPoint[6] = "0x000000" + Var taobinTextColorPoint[7] = "0x000000" + Var taobinTextColorPoint[8] = "0x000000" DEBUGVAR PointState[0] DEBUGVAR PointState[1] @@ -147,7 +142,7 @@ Else If newPointIndex >= 0 Then Var taobinImgPoint[newPointIndex] = "/point_active_new.png" - ;Var taobinTextColorPoint[newPointIndex] = "0x2CDD69" + Var taobinTextColorPoint[newPointIndex] = "0xFFE400" EndIf EndIf @@ -298,57 +293,57 @@ - 220 + 287 1126 Var( DirImage + taobinImgPoint[0]) - 360 + 497 1126 Var( DirImage + taobinImgPoint[1]) - 500 + 706 1126 Var( DirImage + taobinImgPoint[2]) - 640 - 1126 + 287 + 1296 Var( DirImage + taobinImgPoint[3]) - 780 - 1126 + 497 + 1296 Var( DirImage + taobinImgPoint[4]) - 220 - 1276 + 706 + 1296 Var( DirImage + taobinImgPoint[5]) - 360 - 1276 + 287 + 1456 Var( DirImage + taobinImgPoint[6]) - 500 - 1276 + 497 + 1456 Var( DirImage + taobinImgPoint[7]) - 640 - 1276 + 706 + 1456 Var( DirImage + taobinImgPoint[8]) @@ -432,208 +427,116 @@ text8_X - 1578 + 1610 Var( DirImage + "/text8.png" ) -; -; 232 -; 1240 -; ThaiTextState -; 12 -; 120 -; KanitRegularTTF -; taobinTextColorPoint[0] -; taobinTextPointTH[0] -; -; -; -; 243 -; 1240 -; EngTextState -; 12 -; 100 -; KanitRegularTTF -; taobinTextColorPoint[0] -; taobinTextPointEN[0] -; -; -; -; 343 -; 1240 -; ThaiTextState -; 12 -; 150 -; KanitRegularTTF -; taobinTextColorPoint[1] -; taobinTextPointTH[1] -; -; -; -; 388 -; 1240 -; EngTextState -; 12 -; 100 -; KanitRegularTTF -; taobinTextColorPoint[1] -; taobinTextPointEN[1] -; -; -; -; 493 -; 1240 -; ThaiTextState -; 12 -; 120 -; KanitRegularTTF -; taobinTextColorPoint[2] -; taobinTextPointTH[2] -; -; -; -; 497 -; 1240 -; EngTextState -; 12 -; 150 -; KanitRegularTTF -; taobinTextColorPoint[2] -; taobinTextPointEN[2] -; -; -; -; 624 -; 1240 -; ThaiTextState -; 12 -; 120 -; KanitRegularTTF -; taobinTextColorPoint[3] -; taobinTextPointTH[3] -; -; -; -; 645 -; 1240 -; EngTextState -; 12 -; 100 -; KanitRegularTTF -; taobinTextColorPoint[3] -; taobinTextPointEN[3] -; -; -; -; 747 -; 1240 -; ThaiTextState -; 12 -; 155 -; KanitRegularTTF -; taobinTextColorPoint[4] -; taobinTextPointTH[4] -; -; -; -; 782 -; 1240 -; EngTextState -; 12 -; 100 -; KanitRegularTTF -; taobinTextColorPoint[4] -; taobinTextPointEN[4] -; -; -; -; 225 -; 1388 -; ThaiTextState -; 12 -; 120 -; KanitRegularTTF -; taobinTextColorPoint[5] -; taobinTextPointTH[5] -; -; -; -; 230 -; 1388 -; EngTextState -; 12 -; 200 -; KanitRegularTTF -; taobinTextColorPoint[5] -; taobinTextPointEN[5] -; -; -; -; 353 -; 1388 -; ThaiTextState -; 12 -; 150 -; KanitRegularTTF -; taobinTextColorPoint[6] -; taobinTextPointTH[6] -; -; -; -; 366 -; 1388 -; EngTextState -; 12 -; 100 -; KanitRegularTTF -; taobinTextColorPoint[6] -; taobinTextPointEN[6] -; -; -; -; 488 -; 1388 -; ThaiTextState -; 12 -; 150 -; KanitRegularTTF -; taobinTextColorPoint[7] -; taobinTextPointTH[7] -; -; -; -; 506 -; 1388 -; EngTextState -; 12 -; 100 -; KanitRegularTTF -; taobinTextColorPoint[7] -; taobinTextPointEN[7] -; -; -; -; 622 -; 1388 -; ThaiTextState -; 12 -; 200 -; KanitRegularTTF -; taobinTextColorPoint[8] -; taobinTextPointTH[8] -; -; -; -; 616 -; 1388 -; EngTextState -; 12 -; 200 -; KanitRegularTTF -; taobinTextColorPoint[8] -; taobinTextPointEN[8] -; + + 220 + 1250 + 14 + 250 + KanitRegularTTF + taobinTextColorPoint[0] + taobinTextPoint[0] + center-vertical-horizontal + + + + + 431 + 1250 + 14 + 250 + KanitRegularTTF + taobinTextColorPoint[1] + taobinTextPoint[1] + center-vertical-horizontal + + + + + 645 + 1250 + 14 + 250 + KanitRegularTTF + taobinTextColorPoint[2] + taobinTextPoint[2] + center-vertical-horizontal + + + + 220 + 1410 + 14 + 250 + KanitRegularTTF + taobinTextColorPoint[3] + taobinTextPoint[3] + center-vertical-horizontal + + + + + 431 + 1410 + 14 + 250 + KanitRegularTTF + taobinTextColorPoint[4] + taobinTextPoint[4] + center-vertical-horizontal + + + + + 645 + 1410 + 14 + 250 + KanitRegularTTF + taobinTextColorPoint[5] + taobinTextPoint[5] + center-vertical-horizontal + + + + + 220 + 1575 + 14 + 250 + KanitRegularTTF + taobinTextColorPoint[6] + taobinTextPoint[6] + center-vertical-horizontal + + + + 431 + 1575 + 14 + 250 + KanitRegularTTF + taobinTextColorPoint[7] + taobinTextPoint[7] + center-vertical-horizontal + + + + 645 + 1575 + 14 + 250 + KanitRegularTTF + taobinTextColorPoint[8] + taobinTextPoint[8] + center-vertical-horizontal + + + ; @@ -648,7 +551,7 @@ End 153 88 - RobotoBold + RobotoBold 0x513C2F ShowCountDownBrewing diff --git a/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_error.xml b/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_error.xml index acfd7542..b14c84c9 100644 --- a/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_error.xml +++ b/xml/event/bad_valentine/page_collect_point_pro_bad_valentine_error.xml @@ -96,7 +96,10 @@ ; Point 3 - If Seeker.selected_a_drink = "12-03-03-0044" Then + If Seeker.selected_a_drink = "12-03-02-0024" Then + Var newPointIndex = 2 + EndIf + If Seeker.selected_a_drink = "12-03-03-0024" Then Var newPointIndex = 2 EndIf @@ -126,7 +129,10 @@ ; Point 8 - If Seeker.selected_a_drink = "12-02-02-0055" Then + If Seeker.selected_a_drink = "12-03-02-0023" Then + Var newPointIndex = 7 + EndIf + If Seeker.selected_a_drink = "12-03-03-0023" Then Var newPointIndex = 7 EndIf diff --git a/xml/menutab/page_catalog_group_milk.xml b/xml/menutab/page_catalog_group_milk.xml index cd2e6750..4fbdbaa7 100644 --- a/xml/menutab/page_catalog_group_milk.xml +++ b/xml/menutab/page_catalog_group_milk.xml @@ -1843,6 +1843,513 @@ MILK" ; - - - + ; ==================> Len = 17 + ; 12-03-01-0023 12-03-02-0023 12-03-03-0023 + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0023.Button,12-03-02-0023.Button,12-03-03-0023.Button,$Sum120301002312030200231203030023) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "นมโตเกียวบานาน่า" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "TOKYO BANANA MILK" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Tokyo Banana Syrup, Milk, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0023.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0023.Button + StringFmt( $12-03-01-0023.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0023.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0023.Button + StringFmt( $12-03-02-0023.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0023.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0023.Button + StringFmt( $12-03-03-0023.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120301002312030200231203030023 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum120301002312030200231203030023 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0023.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0023.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0023.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" + $Sum120301002312030200231203030023 + text_unavailable + center-vertical-horizontal + + + ; + + 33 + 22 + 225 + 296 + Flag( .Button,.Button,.Button,$Sum) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "นมโตเกียวบานาน่า" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "TOKYO BANANA MILK" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Tokyo Banana Syrup, Milk, 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" ) + "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" ) + "Invisible" + + + 183 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 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 $Sum = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.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" + $Sum + text_unavailable + center-vertical-horizontal + + ; ==================> Len = 17 ; 12-03-01-0002 12-03-02-0002 12-03-03-0002 diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index 220ab1a3..1f5aea7b 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -1817,6 +1817,509 @@ MILK" ; - - - + ; ==================> Len = 17 + ; 12-03-01-0023 12-03-02-0023 12-03-03-0023 + + 33 + 22 + 225 + 296 + Flag( 12-03-01-0023.Button,12-03-02-0023.Button,12-03-03-0023.Button,$Sum120301002312030200231203030023) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "นมโตเกียวบานาน่า" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "TOKYO BANANA MILK" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Tokyo Banana Syrup, Milk, Sugar" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-03-01-0023.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-01-0023.Button + StringFmt( $12-03-01-0023.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-03-02-0023.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-02-0023.Button + StringFmt( $12-03-02-0023.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-03-03-0023.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-03-03-0023.Button + StringFmt( $12-03-03-0023.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120301002312030200231203030023 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + 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 $Sum120301002312030200231203030023 = "Disable" Then + STRCONTAIN "ERR" $12-03-01-0023.TAG tag1_is_disable + STRCONTAIN "ERR" $12-03-02-0023.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0023.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" + $Sum120301002312030200231203030023 + text_unavailable + center-vertical-horizontal + + + ; + + 33 + 22 + 225 + 296 + Flag( .Button,.Button,.Button,$Sum) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "นมโตเกียวบานาน่า" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "TOKYO BANANA MILK" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Tokyo Banana Syrup, Milk, 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" ) + "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" ) + "Invisible" + + + 183 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 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 $Sum = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.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" + $Sum + text_unavailable + center-vertical-horizontal + + ; ==================> Len = 17 ; 12-03-01-0002 12-03-02-0002 12-03-03-0002 diff --git a/xml/page_catalog_group_pro_bad_valentine.xml b/xml/page_catalog_group_pro_bad_valentine.xml index ede18d55..16fb8c98 100644 --- a/xml/page_catalog_group_pro_bad_valentine.xml +++ b/xml/page_catalog_group_pro_bad_valentine.xml @@ -1555,38 +1555,38 @@ Matcha, Milk" ; ==================> Len = 12 - ; - - 12-03-03-0044 + ; - 12-03-02-0024 12-03-03-0024 33 22 225 296 - Flag( 12-03-03-0044.Button,$Sum1203030044) + Flag( 12-03-02-0024.Button,12-03-03-0024.Button,$Sum12030200241203030024)