diff --git a/xml/page_collect_point_3_28.xml b/xml/page_collect_point_3_28.xml index 89a54f0a..1e3519be 100644 --- a/xml/page_collect_point_3_28.xml +++ b/xml/page_collect_point_3_28.xml @@ -602,28 +602,39 @@ Var PreviousSeeker = "tempSeeker" Var Seeker.UseGet15Discount = 0 - Var PreviousSeeker.UseGetDrink5Bath = 0 + Var GetDrink5Bath = 0 If Seeker = "curr" Then Var PreviousSeeker.TNumberTaobinCredit = Seeker.TNumberTaobinCredit Var PreviousSeeker.UseGet15Discount = 0 + Var PreviousSeeker.UseGetDrink5Bath = 0 Else If PreviousSeeker.TNumberTaobinCredit = Seeker.TNumberTaobinCredit Then If PreviousSeeker.UseGet15Discount = 1 Then Var Get15DiscountState = "Disable2" EndIf + If PreviousSeeker.UseGetDrink5Bath = 1 Then + Var Get15DiscountState = "Disable2" + EndIf Else Var PreviousSeeker.TNumberTaobinCredit = Seeker.TNumberTaobinCredit Var PreviousSeeker.UseGet15Discount = 0 + Var PreviousSeeker.UseGetDrink5Bath = 0 EndIf EndIf + If CoffeePoint >= 28 Then Var KeepBnBtnImage = "/bn_close.png" Var KeepBpBtnImage = "/bp_close.png" - Var Get15DiscountState = "Disable" - Var PreviousSeeker.UseGetDrink5Bath = 1 + If Get15DiscountState = "Disable2" Then + Var GetDrink5Bath = 0 + Else + Var Get15DiscountState = "Disable2" + Var GetDrink5Bath = 1 + Var PreviousSeeker.UseGetDrink5Bath = 1 + EndIf Else If PreviousSeeker.UseGetDrink5Bath = 1 Then Var Get15DiscountState = "Disable2" @@ -668,7 +679,11 @@ If CoffeePoint >= 28 Then - Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml" + If GetDrink5Bath = 1 Then + Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml" + Else + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf Else Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf @@ -814,7 +829,11 @@ ; goto lid straw ;Open "ROOT/taobin_project/xml/page_back_to_main.xml" If CoffeePoint >= 28 Then - Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml" + If GetDrink5Bath = 1 Then + Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml" + Else + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf Else Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf