diff --git a/image/event/lipit/pro_lipit_en.mp4 b/image/event/lipit/pro_lipit_en.mp4 index b9f2e9f0..ed44bd9f 100755 Binary files a/image/event/lipit/pro_lipit_en.mp4 and b/image/event/lipit/pro_lipit_en.mp4 differ diff --git a/image/event/lipit/pro_lipit_th.mp4 b/image/event/lipit/pro_lipit_th.mp4 index 23affd2e..05b9ab91 100755 Binary files a/image/event/lipit/pro_lipit_th.mp4 and b/image/event/lipit/pro_lipit_th.mp4 differ diff --git a/image/topping2/bn_powerup1baht.png b/image/topping2/bn_powerup1baht.png index f5e4b7c9..24f5639c 100644 Binary files a/image/topping2/bn_powerup1baht.png and b/image/topping2/bn_powerup1baht.png differ diff --git a/image/topping2/bp_powerup1baht.png b/image/topping2/bp_powerup1baht.png index 1823cdd6..a41a4b59 100644 Binary files a/image/topping2/bp_powerup1baht.png and b/image/topping2/bp_powerup1baht.png differ diff --git a/image/topping2_en/bn_powerup1baht.png b/image/topping2_en/bn_powerup1baht.png new file mode 100644 index 00000000..9a48f891 Binary files /dev/null and b/image/topping2_en/bn_powerup1baht.png differ diff --git a/image/topping2_en/bp_powerup1baht.png b/image/topping2_en/bp_powerup1baht.png new file mode 100644 index 00000000..63395bf7 Binary files /dev/null and b/image/topping2_en/bp_powerup1baht.png differ diff --git a/xml/event/lipit/page_collect_point_pro_lipit_2.xml b/xml/event/lipit/page_collect_point_pro_lipit_2.xml index ddac3d39..f2766475 100644 --- a/xml/event/lipit/page_collect_point_pro_lipit_2.xml +++ b/xml/event/lipit/page_collect_point_pro_lipit_2.xml @@ -89,6 +89,7 @@ Var TaobinName = Ext1b Var TelephoneNumber = TelephoneNumberX Var TNumberTaobinMemberXXX = TelephoneNumber + Var Seeker.IsAlreadyGetReward = Ext1c If TaobinName = "" Then Var Seeker.IsLineMember = 0 Else @@ -115,6 +116,21 @@ EndIf EndIf + If Seeker.IsAlreadyGetReward = 1 Then + SAVELOG "Already get reward skip to normal collect point." + If Seeker.CodeChannel = 1 Then + If Seeker.CollectPointMain = 1 Then + GETACCEXT Param1 23 + Open "ROOT/taobin_project/xml/page_collect_point_2.xml" + Else + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf + Else + GETACCEXT Param1 23 + Open "ROOT/taobin_project/xml/page_collect_point_2.xml" + EndIf + EndIf + Var Seeker.PointTaobinStr = ParamCP Var Seeker.TNumberTaobinMember = TelephoneNumberX diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 649d793f..4b7bba9e 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -209,7 +209,7 @@ If SystemDateMonthInt = 4 Then Var MondayBananaPro = 1 EndIf - If SystemDateDayInt <= 12 Then + If SystemDateDayInt <= 5 Then Var LipitPro = 1 EndIf @@ -243,15 +243,15 @@ If BoxID = 201316 Then Var NewFlowPaymentCode = 1 EndIf -If BoxID = 105005 Then - Var PepsiSecondCup30Enable = 1 - Var PepsiSecondCup30DiscountEnable = 1 - Var NewFlowPaymentCode = 1 - - Var LipitPro = 0 - Var MondayBananaPro = 1 - Var FreeEnergyDrink = 0 -EndIf +; If BoxID = 105005 Then +; Var PepsiSecondCup30Enable = 1 +; Var PepsiSecondCup30DiscountEnable = 1 +; Var NewFlowPaymentCode = 1 +; +; Var LipitPro = 0 +; Var MondayBananaPro = 1 +; Var FreeEnergyDrink = 0 +; EndIf If BoxID = 172644 Then Var ProPeachEnable = 1 diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index 72658ad0..b75c3eed 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -241,8 +241,8 @@ Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml" EndIf Else - GETACCEXT Param1 23 - Open "ROOT/taobin_project/xml/page_collect_point_2.xml" + GETACCEXT TelephoneNumber 32 + Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml" EndIf EndIf EndIf @@ -744,6 +744,9 @@ GETACCEXT TelephoneNumber 32 Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml" EndIf + Else + GETACCEXT TelephoneNumber 32 + Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml" EndIf EndIf EndIf