diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index 5973105b..8b64ed6e 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -1127,6 +1127,7 @@
Var Cid = 39
Else
Var Cid = 40
+ Var PreviousSeeker.UseGetDrink5Bath = 0
EndIf
EndIf
@@ -1240,6 +1241,7 @@
Var Cid = 39
Else
Var Cid = 40
+ Var PreviousSeeker.UseGetDrink5Bath = 0
EndIf
EndIf
diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml
index 154ca65f..d80fbf28 100644
--- a/xml/page_brewing3Conti.xml
+++ b/xml/page_brewing3Conti.xml
@@ -602,6 +602,7 @@
Var Cid = 39
Else
Var Cid = 40
+ Var PreviousSeeker.UseGetDrink5Bath = 0
EndIf
EndIf
@@ -721,6 +722,7 @@
Var Cid = 39
Else
Var Cid = 40
+ Var PreviousSeeker.UseGetDrink5Bath = 0
EndIf
EndIf
diff --git a/xml/page_collect_point_3_28.xml b/xml/page_collect_point_3_28.xml
index 1538d334..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
@@ -835,8 +854,6 @@
SoundVolume
- Var Seeker.UseGet15Discount = 1
- Var PreviousSeeker.UseGet15Discount = 1
Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"