From 5a871167d34a8f3bea93601ea99d66260a7e669e Mon Sep 17 00:00:00 2001 From: wanlop run Date: Wed, 9 Jul 2025 17:48:49 +0700 Subject: [PATCH] wait for koko --- xml/page_board.xml | 8 +- xml/page_topping_select7.xml | 4 + xml_main/startup.xml | 4 +- xml_main/startup_dev.xml | 4 +- xmlprofile/y18IDCardCaffeine.json | 112 +++++++++++++++++++++++++++ xmlprofile/y18IDCardExTeaMilk.json | 118 ++++++++++++++++++++++++++++- xmlprofile/y18IDCardSoda.json | 112 +++++++++++++++++++++++++++ 7 files changed, 352 insertions(+), 10 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index 622e7289..ba510905 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -59,6 +59,9 @@ DEBUGVAR web_pin Var web_telnumOK = "" + + DEBUGVAR web_readyOK + Var web_readyOK = "false" Var GetFreeFromError = 0 @@ -74,7 +77,6 @@ Var Seeker.CurrCreditTelNum = "" Var Seeker.CurrCreditPinNum = "" - DEBUGVAR PaySuccessWithDaemonTask Var PaidPaymentFromNextStage = 0 Var DrinkPaid = "-" @@ -181,7 +183,7 @@ STRCONTAIN "1060" MaterialAvailable TaiwanesePowderEnable - + If XMLProfile = "" Then CacheVarStr "get" XMLProfile @@ -2352,7 +2354,7 @@ PRICE "Reset" "-" ; Original value is 40 If EnableMultiInstance = "true" Then - If CountUpReloadAll > 100 Then + If CountUpReloadAll > 200 Then Var NeedReboot = "false" Var StartUpExt = "-" diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index cdd3cf7e..a167a96e 100644 --- a/xml/page_topping_select7.xml +++ b/xml/page_topping_select7.xml @@ -2553,6 +2553,10 @@ Var showShotEnable = "Invisible" Var ShotCoffeePremium = "Invisible" Var ExtraTopping = "Invisible" + + Var CustomCoffeeEnable = "False" + Var showCustomCoffee = "Invisible" + var showCoffeeLevel = "Invisible" EndIf Function 2 diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 2de53868..d5268f98 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "10.15" - Var XMLPageVersionInt = 1015 + Var XMLPageVersion = "10.16" + Var XMLPageVersionInt = 1016 Var CurrentMainVideo = 2 diff --git a/xml_main/startup_dev.xml b/xml_main/startup_dev.xml index ec806792..788b6e6d 100644 --- a/xml_main/startup_dev.xml +++ b/xml_main/startup_dev.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "11.15" - Var XMLPageVersionInt = 1115 + Var XMLPageVersion = "11.16" + Var XMLPageVersionInt = 1116 ;Oreo Var OreoGuarantee = 0 diff --git a/xmlprofile/y18IDCardCaffeine.json b/xmlprofile/y18IDCardCaffeine.json index 80eec087..c6c7bf99 100644 --- a/xmlprofile/y18IDCardCaffeine.json +++ b/xmlprofile/y18IDCardCaffeine.json @@ -5444,6 +5444,118 @@ { "productCode": "T0068-15000", "enable": true + }, + { + "productCode": "12-21-01-0068", + "enable": true + }, + { + "productCode": "12-01-02-0093", + "enable": true + }, + { + "productCode": "12-01-01-0097", + "enable": true + }, + { + "productCode": "12-01-02-0096", + "enable": true + }, + { + "productCode": "12-01-02-0098", + "enable": true + }, + { + "productCode": "12-21-01-0094", + "enable": true + }, + { + "productCode": "12-01-01-0095", + "enable": true + }, + { + "productCode": "12-01-01-0093", + "enable": true + }, + { + "productCode": "12-01-01-0096", + "enable": true + }, + { + "productCode": "12-01-02-0094", + "enable": true + }, + { + "productCode": "12-05-02-0160", + "enable": true + }, + { + "productCode": "12-21-02-0095", + "enable": true + }, + { + "productCode": "12-21-01-0096", + "enable": true + }, + { + "productCode": "12-01-01-0098", + "enable": true + }, + { + "productCode": "12-21-01-0095", + "enable": true + }, + { + "productCode": "12-05-03-0160", + "enable": true + }, + { + "productCode": "12-21-01-0098", + "enable": true + }, + { + "productCode": "12-21-01-0093", + "enable": true + }, + { + "productCode": "12-21-02-0093", + "enable": true + }, + { + "productCode": "12-21-02-0097", + "enable": true + }, + { + "productCode": "12-01-02-0097", + "enable": true + }, + { + "productCode": "12-01-01-0068", + "enable": true + }, + { + "productCode": "12-21-02-0098", + "enable": true + }, + { + "productCode": "12-01-01-0094", + "enable": true + }, + { + "productCode": "12-21-02-0096", + "enable": true + }, + { + "productCode": "12-01-02-0095", + "enable": true + }, + { + "productCode": "12-21-02-0094", + "enable": true + }, + { + "productCode": "12-21-01-0097", + "enable": true } ] } \ No newline at end of file diff --git a/xmlprofile/y18IDCardExTeaMilk.json b/xmlprofile/y18IDCardExTeaMilk.json index b9c7546b..9cbd030e 100644 --- a/xmlprofile/y18IDCardExTeaMilk.json +++ b/xmlprofile/y18IDCardExTeaMilk.json @@ -5259,7 +5259,7 @@ }, { "productCode": "T0062-80000", - "enable": true + "enable": false }, { "productCode": "12-02-02-0117", @@ -5411,7 +5411,7 @@ }, { "productCode": "12-05-02-0134", - "enable": true + "enable": false }, { "productCode": "12-02-01-0118", @@ -5435,7 +5435,7 @@ }, { "productCode": "12-05-03-0134", - "enable": true + "enable": false }, { "productCode": "12-02-02-0111", @@ -5496,6 +5496,118 @@ { "productCode": "T0068-15000", "enable": true + }, + { + "productCode": "12-21-01-0068", + "enable": true + }, + { + "productCode": "12-01-02-0093", + "enable": true + }, + { + "productCode": "12-01-01-0097", + "enable": true + }, + { + "productCode": "12-01-02-0096", + "enable": true + }, + { + "productCode": "12-01-02-0098", + "enable": true + }, + { + "productCode": "12-21-01-0094", + "enable": true + }, + { + "productCode": "12-01-01-0095", + "enable": true + }, + { + "productCode": "12-01-01-0093", + "enable": true + }, + { + "productCode": "12-01-01-0096", + "enable": true + }, + { + "productCode": "12-01-02-0094", + "enable": true + }, + { + "productCode": "12-05-02-0160", + "enable": true + }, + { + "productCode": "12-21-02-0095", + "enable": true + }, + { + "productCode": "12-21-01-0096", + "enable": true + }, + { + "productCode": "12-01-01-0098", + "enable": true + }, + { + "productCode": "12-21-01-0095", + "enable": true + }, + { + "productCode": "12-05-03-0160", + "enable": true + }, + { + "productCode": "12-21-01-0098", + "enable": true + }, + { + "productCode": "12-21-01-0093", + "enable": true + }, + { + "productCode": "12-21-02-0093", + "enable": true + }, + { + "productCode": "12-21-02-0097", + "enable": true + }, + { + "productCode": "12-01-02-0097", + "enable": true + }, + { + "productCode": "12-01-01-0068", + "enable": true + }, + { + "productCode": "12-21-02-0098", + "enable": true + }, + { + "productCode": "12-01-01-0094", + "enable": true + }, + { + "productCode": "12-21-02-0096", + "enable": true + }, + { + "productCode": "12-01-02-0095", + "enable": true + }, + { + "productCode": "12-21-02-0094", + "enable": true + }, + { + "productCode": "12-21-01-0097", + "enable": true } ] } \ No newline at end of file diff --git a/xmlprofile/y18IDCardSoda.json b/xmlprofile/y18IDCardSoda.json index 63e8c702..f635b9ef 100644 --- a/xmlprofile/y18IDCardSoda.json +++ b/xmlprofile/y18IDCardSoda.json @@ -5444,6 +5444,118 @@ { "productCode": "T0068-15000", "enable": true + }, + { + "productCode": "12-21-01-0068", + "enable": true + }, + { + "productCode": "12-01-02-0093", + "enable": true + }, + { + "productCode": "12-01-01-0097", + "enable": true + }, + { + "productCode": "12-01-02-0096", + "enable": true + }, + { + "productCode": "12-01-02-0098", + "enable": true + }, + { + "productCode": "12-21-01-0094", + "enable": true + }, + { + "productCode": "12-01-01-0095", + "enable": true + }, + { + "productCode": "12-01-01-0093", + "enable": true + }, + { + "productCode": "12-01-01-0096", + "enable": true + }, + { + "productCode": "12-01-02-0094", + "enable": true + }, + { + "productCode": "12-05-02-0160", + "enable": true + }, + { + "productCode": "12-21-02-0095", + "enable": true + }, + { + "productCode": "12-21-01-0096", + "enable": true + }, + { + "productCode": "12-01-01-0098", + "enable": true + }, + { + "productCode": "12-21-01-0095", + "enable": true + }, + { + "productCode": "12-05-03-0160", + "enable": true + }, + { + "productCode": "12-21-01-0098", + "enable": true + }, + { + "productCode": "12-21-01-0093", + "enable": true + }, + { + "productCode": "12-21-02-0093", + "enable": true + }, + { + "productCode": "12-21-02-0097", + "enable": true + }, + { + "productCode": "12-01-02-0097", + "enable": true + }, + { + "productCode": "12-01-01-0068", + "enable": true + }, + { + "productCode": "12-21-02-0098", + "enable": true + }, + { + "productCode": "12-01-01-0094", + "enable": true + }, + { + "productCode": "12-21-02-0096", + "enable": true + }, + { + "productCode": "12-01-02-0095", + "enable": true + }, + { + "productCode": "12-21-02-0094", + "enable": true + }, + { + "productCode": "12-21-01-0097", + "enable": true } ] } \ No newline at end of file