diff --git a/xml/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index 59ecee07..06840b70 100644 --- a/xml/page_NewBrewing3.xml +++ b/xml/page_NewBrewing3.xml @@ -266,46 +266,8 @@ DEBUGVAR NeedReboot DEBUGVAR SELLSTATUS - ; copy stage - Var bg_lidProblem_ST2 = bg_lidProblem_ST - DEBUGVAR bg_lidProblem_ST2 - ; zone Language - If LanguageObjectShow = "Enable" Then - Var XStraw = 350 - Var SelectMenuBetweenBrewEnable2 = SelectMenuBetweenBrewEnable1 - Var SelectMenuBetweenBrewEnable1 = "Invisible" - - Var IMG_CNT = "ROOT/taobin_project/image/page_doing_inter/bg_show_time_remaining.png" - - Var bg_lidProblem_ST = "Invisible" - Var GetLidButtonState = "Invisible" - Var bg_strawProblem_ST = "Invisible" - var EnableGetMoreStrawFileName = "Invisible" - var EnableGetMoreStrawFileName2 = "Enable" - - Var bg_strawProblem_ST2 = "Invisible" - - If bg_lidProblem_ST2 = "Invisible" Then - Var GetLidButtonState2 = "Enable" - Else - Var GetLidButtonState2 = "Invisible" - EndIf - - EndIf - - - - If NoLangObjectShow = "Enable" Then - Var SelectMenuBetweenBrewEnable2 = "Invisible" - - Var bg_lidProblem_ST2 = "Invisible" - Var GetLidButtonState2 = "Invisible" - Var bg_strawProblem_ST2 = "Invisible" - var EnableGetMoreStrawFileName2 = "Invisible" - - - DEBUGVAR bg_lidProblem_ST + DEBUGVAR bg_lidProblem_ST If bg_lidProblem_ST = "Invisible" Then @@ -314,12 +276,6 @@ EndIf - EndIf - - DEBUGVAR LanguageObjectShow - DEBUGVAR NoLangObjectShow - - Var CreditCardVoid = 0 If InternationalEnable = 1 Then Var adver_brewing_en = 0 @@ -342,6 +298,16 @@ ; language instance + If bg_lidProblem_ST = "Enable" Then + Var EnableTopupCreditBetweenBrew = "Invisible" + Var EnableGetMore + End + + If bg_strawProblem_ST = "Enable" Then + Var EnableGetMoreStrawFileName = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" + EndIf + DEBUGVAR SelectMenuBetweenBrewEnable1 DEBUGVAR SelectMenuBetweenBrewEnable2 @@ -1028,7 +994,7 @@ If CLOSE_ORDER_NOW = "true" Then Var SelectMenuBetweenBrewEnable1 = "Invisible" Var SelectMenuBetweenBrewEnable1Text = "Invisible" - Var SelectMenuBetweenBrewEnable2 = "Invisible" + Var EnableTopupCreditBetweenBrew = "Invisible" EndIf @@ -1047,16 +1013,8 @@ EndIf Else - If SelectMenuBetweenBrewEnable2 = "Enable" Then - If SelectMenuBetweenBrewEnable1Blink = "Enable" Then - Var SelectMenuBetweenBrewEnable1Blink = "Invisible" - Else - Var SelectMenuBetweenBrewEnable1Blink = "Enable" - EndIf - - Else - Var SelectMenuBetweenBrewEnable1Blink = "Invisible" - EndIf + Var SelectMenuBetweenBrewEnable1Blink = "Invisible" + EndIf DEBUGVAR CountUpBrewing @@ -1246,33 +1204,24 @@ EndIf EndIf - If EnableGetMoreStrawFileName2 = "PressForever" Then - DEBUGVAR GetMoreStrawCount - If GetMoreStrawCount > 0 Then - If EnableGetMoreStrawFileNameCountDown > 0 Then - Var EnableGetMoreStrawFileNameCountDown = EnableGetMoreStrawFileNameCountDown - 1 - If EnableGetMoreStrawFileNameCountDown = 0 Then - Var EnableGetMoreStrawFileName2 = "Enable" - EndIf - EndIf - - EndIf - EndIf If GetMoreStrawCount <= 0 Then If StrawProblemStatus = 1 Then Var StrawProblemStatus = 2 - If NoLangObjectShow = "Enable" Then - Var bg_strawProblem_ST = "Enable" - Else - Var bg_strawProblem_ST2 = "Enable" - EndIf + + Var bg_strawProblem_ST = "Enable" + + + + Var EnableTopupCreditBetweenBrew = "Invisible" + Var EnableGetMoreStrawFileName = "Invisible" + EndIf EndIf - DEBUGVAR bg_lidProblem_ST2 + If GetLidButtonCountDown > 0 Then @@ -1287,27 +1236,21 @@ Var GetLidButtonCountDown = 0 EndIf - If NoLangObjectShow = "Enable" Then - If GetLidButtonCountDown = 1 Then + + If GetLidButtonCountDown = 1 Then Var GetLidButtonState = "Invisible" Var bg_lidProblem_ST = "Enable" + Var EnableTopupCreditBetweenBrew = "Invisible" ;Var XStraw = 356 - EndIf + If EnableGetMoreStrawFileName = "Enable" Then + Var XStraw = 280 + EndIf + EndIf - Var bg_lidProblem_ST = "Invisible" - - If LanguageObjectShow = "Enable" Then - - If GetLidButtonCountDown = 1 Then - Var GetLidButtonState2 = "Invisible" - Var bg_lidProblem_ST2 = "Enable" - Var XStraw = 365 - - EndIf - EndIf + If ButtonGameCountDown > 0 Then If ButtonGameCountDown = 1 Then @@ -1412,15 +1355,7 @@ text_next_order - - 0 - 1655 - 1080 - SelectMenuBetweenBrewEnable2 - - 000408 - - + @@ -1450,22 +1385,7 @@ ShowCountDownBrewing - - 816 - 429 - LanguageObjectShow - - 000405 - - - - 941 - 518 - LanguageObjectShow - - 000406 - - + Var BREW_COUNT_DOWN_FROM_APP = "off" @@ -1531,32 +1451,7 @@ - ; ; @@ -1587,8 +1482,8 @@ -;==================================================================== - - - -;------------------------- - - - ; test drinkfail with phone number