From f0bc1dbb08affe0c1e84edb7335f314035fb05a7 Mon Sep 17 00:00:00 2001 From: kenta-work Date: Fri, 29 Sep 2023 11:30:48 +0700 Subject: [PATCH] update pepween collect point only pepween menu --- .../page_collect_point_pro_pepween_2.xml | 90 ++++- .../page_collect_point_pro_pepween_3.xml | 307 ++++++++++++------ .../page_collect_point_pro_pepween_error.xml | 47 +++ .../script_common_for_open_promotion_xml.ev | 7 + 4 files changed, 336 insertions(+), 115 deletions(-) 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..032315f6 100644 --- a/xml/event/pepween/page_collect_point_pro_pepween_2.xml +++ b/xml/event/pepween/page_collect_point_pro_pepween_2.xml @@ -8,6 +8,52 @@ ; On open + ; Check if product code is not pepween menu go to page collect point normal + Var GoToNormalCollectPoint = 1 + If Seeker.selected_a_drink = "12-99-05-0053" Then + Var GoToNormalCollectPoint = 0 + EndIf + If Seeker.selected_a_drink = "12-99-05-0054" Then + Var GoToNormalCollectPoint = 0 + EndIf + If Seeker.selected_a_drink = "12-99-05-0055" Then + Var GoToNormalCollectPoint = 0 + EndIf + If Seeker.selected_a_drink = "12-99-05-0057" Then + Var GoToNormalCollectPoint = 0 + EndIf + If Seeker.selected_a_drink = "12-99-05-0058" Then + Var GoToNormalCollectPoint = 0 + EndIf + If Seeker.selected_a_drink = "12-99-05-0059" Then + Var GoToNormalCollectPoint = 0 + EndIf + If Seeker.selected_a_drink = "12-99-05-0060" Then + Var GoToNormalCollectPoint = 0 + EndIf + If Seeker.selected_a_drink = "12-99-05-0061" Then + Var GoToNormalCollectPoint = 0 + EndIf + If Seeker.selected_a_drink = "12-99-05-0062" Then + Var GoToNormalCollectPoint = 0 + EndIf + If Seeker.selected_a_drink = "12-99-05-0064" Then + Var GoToNormalCollectPoint = 0 + EndIf + If Seeker.selected_a_drink = "12-99-05-0065" Then + Var GoToNormalCollectPoint = 0 + EndIf + If Seeker.selected_a_drink = "12-99-05-0056" Then + Var GoToNormalCollectPoint = 0 + EndIf + If Seeker.selected_a_drink = "12-99-05-0066" Then + Var GoToNormalCollectPoint = 0 + EndIf + + If GoToNormalCollectPoint = 1 Then + Open "ROOT/taobin_project/xml/page_collect_point_2.xml" + EndIf + Var Timeout = 0 SAVELOG UnitTestType @@ -158,46 +204,62 @@ Var PopweenPointNewIndex = 0 - If Seeker.ProductCode = "12-99-05-0053" Then + If Seeker.selected_a_drink = "12-99-05-0053" Then Var PopweenPointNewIndex = 0 + Var PopweenPointState[0] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0054" Then + If Seeker.selected_a_drink = "12-99-05-0054" Then Var PopweenPointNewIndex = 1 + Var PopweenPointState[1] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0055" Then + If Seeker.selected_a_drink = "12-99-05-0055" Then Var PopweenPointNewIndex = 2 + Var PopweenPointState[2] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0057" Then + If Seeker.selected_a_drink = "12-99-05-0057" Then Var PopweenPointNewIndex = 3 + Var PopweenPointState[3] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0058" Then + If Seeker.selected_a_drink = "12-99-05-0058" Then Var PopweenPointNewIndex = 4 + Var PopweenPointState[4] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0059" Then + If Seeker.selected_a_drink = "12-99-05-0059" Then Var PopweenPointNewIndex = 5 + Var PopweenPointState[5] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0060" Then + If Seeker.selected_a_drink = "12-99-05-0060" Then Var PopweenPointNewIndex = 6 + Var PopweenPointState[6] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0061" Then + If Seeker.selected_a_drink = "12-99-05-0061" Then Var PopweenPointNewIndex = 7 + Var PopweenPointState[7] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0062" Then + If Seeker.selected_a_drink = "12-99-05-0062" Then Var PopweenPointNewIndex = 8 + Var PopweenPointState[8] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0064" Then + If Seeker.selected_a_drink = "12-99-05-0064" Then Var PopweenPointNewIndex = 9 + Var PopweenPointState[9] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0065" Then + If Seeker.selected_a_drink = "12-99-05-0065" Then Var PopweenPointNewIndex = 10 + Var PopweenPointState[10] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0056" Then + If Seeker.selected_a_drink = "12-99-05-0056" Then Var PopweenPointNewIndex = 11 + Var PopweenPointState[11] = 1 EndIf - If Seeker.ProductCode = "12-99-05-0066" Then - Var PopweenPointNewIndex = 11 + If Seeker.selected_a_drink = "12-99-05-0066" Then + Var PopweenPointNewIndex = 12 + 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..572b6b74 100644 --- a/xml/event/pepween/page_collect_point_pro_pepween_3.xml +++ b/xml/event/pepween/page_collect_point_pro_pepween_3.xml @@ -102,33 +102,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" @@ -196,15 +196,15 @@ Var CheckCouponState = "Disable" EndIf - Var CurrentPointSlot = "10" - Var CurrentPointCheck = "" + Var CurrentPointSlot = PopweenPointNewIndex + 1 + + If SELLONLINE = 1 Then + Var CurrentPointCheck = "" + Else + Var CurrentPointCheck = "check" + EndIf Var val3 = "X" AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3 - -; Var CodeType = "114" -; Var val2 = "X" -; Var val3 = "X" -; AddData 36 TelephoneNumber CodeType val2 val3 1000 @@ -216,24 +216,8 @@ 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 + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf @@ -243,46 +227,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 @@ -575,131 +524,287 @@ 239 1244 + ThaiTextState 12 100 KanitRegularTTF taobinTextColorPoint[0] - taobinTextPoint[0] + taobinTextPointTH[0] + + + + 250 + 1244 + EngTextState + 12 + 100 + KanitRegularTTF + taobinTextColorPoint[0] + taobinTextPointEN[0] 374 1244 + ThaiTextState 12 100 KanitRegularTTF taobinTextColorPoint[1] - taobinTextPoint[1] + taobinTextPointTH[1] + + + + 382 + 1244 + EngTextState + 12 + 100 + KanitRegularTTF + taobinTextColorPoint[1] + taobinTextPointEN[1] 498 1244 + ThaiTextState 12 100 KanitRegularTTF taobinTextColorPoint[2] - taobinTextPoint[2] + taobinTextPointTH[2] + + + + 485 + 1244 + EngTextState + 12 + 150 + KanitRegularTTF + taobinTextColorPoint[2] + taobinTextPointEN[2] 635 1244 + ThaiTextState 12 100 KanitRegularTTF taobinTextColorPoint[3] - taobinTextPoint[3] + taobinTextPointTH[3] + + + + 644 + 1244 + EngTextState + 12 + 100 + KanitRegularTTF + taobinTextColorPoint[3] + taobinTextPointEN[3] 765 1244 + ThaiTextState 12 100 KanitRegularTTF taobinTextColorPoint[4] - taobinTextPoint[4] + taobinTextPointTH[4] + + + + 775 + 1244 + EngTextState + 12 + 100 + KanitRegularTTF + taobinTextColorPoint[4] + taobinTextPointEN[4] 227 1388 + ThaiTextState 12 105 KanitRegularTTF taobinTextColorPoint[5] - taobinTextPoint[5] + taobinTextPointTH[5] - 370 + 250 1388 + EngTextState + 12 + 105 + KanitRegularTTF + taobinTextColorPoint[5] + taobinTextPointEN[5] + + + + 375 + 1388 + ThaiTextState 12 100 KanitRegularTTF taobinTextColorPoint[6] - taobinTextPoint[6] + taobinTextPointTH[6] + + + + 368 + 1388 + EngTextState + 12 + 100 + KanitRegularTTF + taobinTextColorPoint[6] + taobinTextPointEN[6] 521 1388 + ThaiTextState 12 100 KanitRegularTTF taobinTextColorPoint[7] - taobinTextPoint[7] + taobinTextPointTH[7] + + + + 508 + 1388 + EngTextState + 12 + 100 + KanitRegularTTF + taobinTextColorPoint[7] + taobinTextPointEN[7] 634 1388 + ThaiTextState 12 100 KanitRegularTTF taobinTextColorPoint[8] - taobinTextPoint[8] + taobinTextPointTH[8] + + + + 634 + 1388 + EngTextState + 12 + 100 + KanitRegularTTF + taobinTextColorPoint[8] + taobinTextPointEN[8] 769 1388 + ThaiTextState 12 100 KanitRegularTTF taobinTextColorPoint[9] - taobinTextPoint[9] + taobinTextPointTH[9] + + + + 764 + 1388 + EngTextState + 12 + 100 + KanitRegularTTF + taobinTextColorPoint[9] + taobinTextPointEN[9] 246 1530 + ThaiTextState 12 100 KanitRegularTTF taobinTextColorPoint[10] - taobinTextPoint[10] + taobinTextPointTH[10] + + + + 246 + 1530 + EngTextState + 12 + 100 + KanitRegularTTF + taobinTextColorPoint[10] + taobinTextPointEN[10] 355 1530 + ThaiTextState 12 110 KanitRegularTTF taobinTextColorPoint[11] - taobinTextPoint[11] + taobinTextPointTH[11] + + + + 375 + 1530 + EngTextState + 12 + 110 + KanitRegularTTF + taobinTextColorPoint[11] + taobinTextPointEN[11] 515 1530 + ThaiTextState 12 100 KanitRegularTTF taobinTextColorPoint[12] - taobinTextPoint[12] + taobinTextPointTH[12] + + + + 500 + 1530 + EngTextState + 12 + 100 + KanitRegularTTF + taobinTextColorPoint[12] + taobinTextPointEN[12] ; diff --git a/xml/event/pepween/page_collect_point_pro_pepween_error.xml b/xml/event/pepween/page_collect_point_pro_pepween_error.xml index 6a2223ad..11140285 100644 --- a/xml/event/pepween/page_collect_point_pro_pepween_error.xml +++ b/xml/event/pepween/page_collect_point_pro_pepween_error.xml @@ -22,6 +22,53 @@ Var ShowEngText = "Invisible" EndIf + Var PopweenPointNewIndex = 0 + + If Seeker.selected_a_drink = "12-99-05-0053" Then + Var PopweenPointNewIndex = 0 + EndIf + If Seeker.selected_a_drink = "12-99-05-0054" Then + Var PopweenPointNewIndex = 1 + EndIf + If Seeker.selected_a_drink = "12-99-05-0055" Then + Var PopweenPointNewIndex = 2 + EndIf + If Seeker.selected_a_drink = "12-99-05-0057" Then + Var PopweenPointNewIndex = 3 + EndIf + If Seeker.selected_a_drink = "12-99-05-0058" Then + Var PopweenPointNewIndex = 4 + EndIf + If Seeker.selected_a_drink = "12-99-05-0059" Then + Var PopweenPointNewIndex = 5 + EndIf + If Seeker.selected_a_drink = "12-99-05-0060" Then + Var PopweenPointNewIndex = 6 + EndIf + If Seeker.selected_a_drink = "12-99-05-0061" Then + Var PopweenPointNewIndex = 7 + EndIf + If Seeker.selected_a_drink = "12-99-05-0062" Then + Var PopweenPointNewIndex = 8 + EndIf + If Seeker.selected_a_drink = "12-99-05-0064" Then + Var PopweenPointNewIndex = 9 + EndIf + If Seeker.selected_a_drink = "12-99-05-0065" Then + Var PopweenPointNewIndex = 10 + EndIf + If Seeker.selected_a_drink = "12-99-05-0056" Then + Var PopweenPointNewIndex = 11 + EndIf + If Seeker.selected_a_drink = "12-99-05-0066" Then + Var PopweenPointNewIndex = 12 + EndIf + + Var CurrentPointSlot = PopweenPointNewIndex + 1 + Var CurrentPointCheck = "check" + Var val3 = "X" + AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3 + 1000 diff --git a/xml/event/script_common_for_open_promotion_xml.ev b/xml/event/script_common_for_open_promotion_xml.ev index 75454a44..8e06ea52 100644 --- a/xml/event/script_common_for_open_promotion_xml.ev +++ b/xml/event/script_common_for_open_promotion_xml.ev @@ -5,6 +5,13 @@ DEBUGVAR PayOfflineMode ; zone promote If OpenFromPageBoard = 1 Then + If PepweenEnable = 1 Then + Var BigButtonEnable = "Enable" + OpenInst 2 "ROOT/taobin_project/xml/event/promotion_pepween.xml" + Var OpenFromPageBoard = 0 + EndIf + + If TamatianEnable = 1 Then Var BigButtonEnable = "Enable"