From c5a06310771658bb6288e5211969c838d7799f7a Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Thu, 22 May 2025 18:26:24 +0700 Subject: [PATCH] AUS: Add CleanFeedback --- inter/aus/xml/event/tricker.ev | 3 +- inter/aus/xml/page_brewing3.lxml | 35 +++++++++--------- inter/aus/xml/page_brewing3Conti.xml | 38 +++++++++----------- inter/aus/xml/page_collect_point_1.lxml | 14 ++++++-- inter/aus/xml/page_collect_point_2.lxml | 11 +++--- inter/aus/xml/page_collect_point_error.lxml | 40 +++++++++++++-------- 6 files changed, 78 insertions(+), 63 deletions(-) diff --git a/inter/aus/xml/event/tricker.ev b/inter/aus/xml/event/tricker.ev index 1a4da16f..16d1b5ce 100644 --- a/inter/aus/xml/event/tricker.ev +++ b/inter/aus/xml/event/tricker.ev @@ -9,7 +9,8 @@ ; Enable app game Var GameEnableFromTrickerEv = 0 -Var NewCollectPointFlag = 1 +Var New_Payment = 1 +Var CleanFeedbackFlag = 1 Var HappyEasterPro = 0 Var AutumnBreezePro = 0 diff --git a/inter/aus/xml/page_brewing3.lxml b/inter/aus/xml/page_brewing3.lxml index 0ce2be47..43921f17 100644 --- a/inter/aus/xml/page_brewing3.lxml +++ b/inter/aus/xml/page_brewing3.lxml @@ -1122,18 +1122,17 @@ If AddData = 1 Then Var Cid = 26 - If NewCollectPointFlag = 1 Then - If Seeker.redeemDiscount = "2_dollar" Then - Var Cid = 49 - EndIf - If Seeker.redeemDiscount = "1_dollar" Then - Var Cid = 48 - EndIf - - Var Seeker.redeemDiscount = "" + If Seeker.redeemDiscount = "2_dollar" Then + Var Cid = 49 EndIf + If Seeker.redeemDiscount = "1_dollar" Then + Var Cid = 48 + EndIf + + Var Seeker.redeemDiscount = "" + AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore EndIf @@ -1238,17 +1237,15 @@ If AddData = 1 Then Var Cid = 26 - If NewCollectPointFlag = 1 Then - If Seeker.redeemDiscount = "2_dollar" Then - Var Cid = 49 - EndIf - - If Seeker.redeemDiscount = "1_dollar" Then - Var Cid = 48 - EndIf - - Var Seeker.redeemDiscount = "" + If Seeker.redeemDiscount = "2_dollar" Then + Var Cid = 49 EndIf + + If Seeker.redeemDiscount = "1_dollar" Then + Var Cid = 48 + EndIf + + Var Seeker.redeemDiscount = "" AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore EndIf diff --git a/inter/aus/xml/page_brewing3Conti.xml b/inter/aus/xml/page_brewing3Conti.xml index 74c270bf..c9bb8550 100644 --- a/inter/aus/xml/page_brewing3Conti.xml +++ b/inter/aus/xml/page_brewing3Conti.xml @@ -622,19 +622,17 @@ If AddData = 1 Then Var Cid = 26 DEBUGVAR "Brewing3Conti" - If NewCollectPointFlag = 1 Then - If Seeker.redeemDiscount = "2_dollar" Then - Var Cid = 49 - EndIf - - If Seeker.redeemDiscount = "1_dollar" Then - Var Cid = 48 - EndIf - - DEBUGVAR Seeker.redeemDiscount - Var Seeker.redeemDiscount = "" + If Seeker.redeemDiscount = "2_dollar" Then + Var Cid = 49 EndIf + If Seeker.redeemDiscount = "1_dollar" Then + Var Cid = 48 + EndIf + + DEBUGVAR Seeker.redeemDiscount + Var Seeker.redeemDiscount = "" + DEBUGVAR Cid DEBUGVAR Seeker DEBUGVAR Seeker.TNumberTaobinMember @@ -750,18 +748,16 @@ If AddData = 1 Then Var Cid = 26 - If NewCollectPointFlag = 1 Then - If Seeker.redeemDiscount = "2_dollar" Then - Var Cid = 49 - EndIf - - If Seeker.redeemDiscount = "1_dollar" Then - Var Cid = 48 - EndIf - - Var Seeker.redeemDiscount = "" + If Seeker.redeemDiscount = "2_dollar" Then + Var Cid = 49 EndIf + If Seeker.redeemDiscount = "1_dollar" Then + Var Cid = 48 + EndIf + + Var Seeker.redeemDiscount = "" + DEBUGVAR Cid DEBUGVAR Seeker DEBUGVAR Seeker.TNumberTaobinMember diff --git a/inter/aus/xml/page_collect_point_1.lxml b/inter/aus/xml/page_collect_point_1.lxml index ce3fc591..d45a9a3f 100644 --- a/inter/aus/xml/page_collect_point_1.lxml +++ b/inter/aus/xml/page_collect_point_1.lxml @@ -185,7 +185,12 @@ ;Open "ROOT/taobin_project/xml/page_catalog.xml" - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + If CleanFeedbackFlag = 1 Then + Var CleanFeedBackToCollectPoint = 0 + Open "ROOT/taobin_project/xml/page_clean_feedback.xml" + Else + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf EndIf If Timeout = 18 Then @@ -531,7 +536,12 @@ ;Open "ROOT/taobin_project/xml/page_catalog.xml" SAVELOG "collect_point1-p589." - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + If CleanFeedbackFlag = 1 Then + Var CleanFeedBackToCollectPoint = 0 + Open "ROOT/taobin_project/xml/page_clean_feedback.xml" + Else + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf diff --git a/inter/aus/xml/page_collect_point_2.lxml b/inter/aus/xml/page_collect_point_2.lxml index d9acc16c..57eb2ad5 100644 --- a/inter/aus/xml/page_collect_point_2.lxml +++ b/inter/aus/xml/page_collect_point_2.lxml @@ -165,11 +165,12 @@ DEBUGVAR Seeker.PointTaobinStr DEBUGVAR Seeker.TNumberTaobinMember - If NewCollectPointFlag = 1 Then - Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_3.lxml" - Else - Open "ROOT/taobin_project/xml/page_collect_point_3.xml" - EndIf + If CleanFeedbackFlag = 1 Then + Var CleanFeedBackToCollectPoint = 1 + Open "ROOT/taobin_project/xml/page_clean_feedback.xml" + Else + Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_3.lxml" + EndIf Else diff --git a/inter/aus/xml/page_collect_point_error.lxml b/inter/aus/xml/page_collect_point_error.lxml index 87db96ef..c5dfde2b 100644 --- a/inter/aus/xml/page_collect_point_error.lxml +++ b/inter/aus/xml/page_collect_point_error.lxml @@ -7,12 +7,12 @@ ; On open - + Var Timeout = 0 SAVELOG show_eng - - If show_eng = "true" Then + + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/display_get_free_en/" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" @@ -24,17 +24,22 @@ EndIf 1000 - + Var Timeout = Timeout + 1 If Timeout > 5 Then ; goto lid straw - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + If CleanFeedbackFlag = 1 Then + Var CleanFeedBackToCollectPoint = 0 + Open "ROOT/taobin_project/xml/page_clean_feedback.xml" + Else + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf EndIf TimerReset Refresh - + If MachineStage = "drink-success" Then @@ -73,10 +78,15 @@ Var( DirImage + "/bp_accept.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ; goto lid straw - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + If CleanFeedbackFlag = 1 Then + Var CleanFeedBackToCollectPoint = 0 + Open "ROOT/taobin_project/xml/page_clean_feedback.xml" + Else + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf @@ -91,17 +101,17 @@ - - - - - - - Open "/media/bt/xml/security_alarm.xml" + + + + + + + Open "/media/bt/xml/security_alarm.xml"