From 44e6e8a468652fe136250aecd18b58592365bb61 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Mon, 15 Jan 2024 09:23:13 +0700 Subject: [PATCH 1/3] fix bug use 15 discount --- xml/page_collect_point_3_28.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/xml/page_collect_point_3_28.xml b/xml/page_collect_point_3_28.xml index 1538d334..89a54f0a 100644 --- a/xml/page_collect_point_3_28.xml +++ b/xml/page_collect_point_3_28.xml @@ -835,8 +835,6 @@ SoundVolume - Var Seeker.UseGet15Discount = 1 - Var PreviousSeeker.UseGet15Discount = 1 Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml" From 399d3719a2fbc38d733b5bbb26db6243c223b114 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Mon, 15 Jan 2024 12:48:37 +0700 Subject: [PATCH 2/3] add bring back if statement --- xml/page_collect_point_3_28.xml | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) 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 From c3ecf9debf45ce0b74f32e156c7b8ee378403b2d Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Mon, 15 Jan 2024 13:12:30 +0700 Subject: [PATCH 3/3] reset state in brewing3 --- xml/page_brewing3.xml | 2 ++ xml/page_brewing3Conti.xml | 2 ++ 2 files changed, 4 insertions(+) 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