From 4862b5fd231d5b7a31bfc35f986b3cd0824c6cba Mon Sep 17 00:00:00 2001 From: kenta-work Date: Fri, 29 Sep 2023 13:33:31 +0700 Subject: [PATCH] update pepween point and point diff --- .../page_collect_point_pro_pepween_2.xml | 46 --------------- .../page_collect_point_pro_pepween_3.xml | 56 ++++++++++--------- xml/page_collect_point_1.xml | 56 +++++++++++++++++-- 3 files changed, 79 insertions(+), 79 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 032315f6..712b7d80 100644 --- a/xml/event/pepween/page_collect_point_pro_pepween_2.xml +++ b/xml/event/pepween/page_collect_point_pro_pepween_2.xml @@ -8,52 +8,6 @@ ; 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 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 572b6b74..3e83a01b 100644 --- a/xml/event/pepween/page_collect_point_pro_pepween_3.xml +++ b/xml/event/pepween/page_collect_point_pro_pepween_3.xml @@ -42,31 +42,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 @@ -144,45 +119,59 @@ 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 @@ -190,6 +179,19 @@ Var taobinTextColorPoint[PopweenPointNewIndex] = "0xE97A13" 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 Seeker = "curr" Then Var CheckCouponState = "Enable" Else @@ -358,7 +360,7 @@ 120 KanitRegularTTF 0xDE794E - CoffeePointRank + PepweenPoint @@ -394,7 +396,7 @@ 120 KanitRegularTTF 0xDE794E - CoffeePointRank + PepweenPoint diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index e49e2d02..0b031be1 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -65,9 +65,51 @@ Var CampaingRef1 = CampaingRef1 + CampaingRef2 Var ParamCP = ParamCP + CampaingRef1 - + Var GoToNormalCollectPoint = 1 + If PepweenEnable = 1 Then + 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 + EndIf + + DEBUGVAR GoToNormalCollectPoint - If Seeker.TNumberTaobinCredit = "" Then @@ -104,7 +146,8 @@ Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP - If PepweenEnable = 1 Then + + If GoToNormalCollectPoint = 0 Then GETACCEXT TelephoneNumber 31 Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml" Else @@ -130,6 +173,7 @@ SAVELOG "collect_point1-p71." Var TelephoneNumberX = TelephoneNumber DEBUGVAR TelephoneNumber + DEBUGVAR GoToNormalCollectPoint If PromotionIDCurrentOrder > 1 Then Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml" EndIf @@ -137,7 +181,7 @@ ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP - If PepweenEnable = 1 Then + If GoToNormalCollectPoint = 0 Then GETACCEXT TelephoneNumber 31 Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml" Else @@ -612,8 +656,8 @@ Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP - - If PepweenEnable = 1 Then + + If GoToNormalCollectPoint = 0 Then GETACCEXT TelephoneNumber 31 Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml" Else