From 2eacf5c3110980aaaf2383497844c9603829e456 Mon Sep 17 00:00:00 2001 From: kenta-work Date: Mon, 11 Sep 2023 14:12:40 +0700 Subject: [PATCH] update topping2 index --- xml/page_topping_select5.xml | 2 +- xml/page_topping_select8.xml | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/xml/page_topping_select5.xml b/xml/page_topping_select5.xml index 32fba528..40e919ef 100644 --- a/xml/page_topping_select5.xml +++ b/xml/page_topping_select5.xml @@ -48,7 +48,7 @@ Var CHECK_EventOpen_Double = 0 If RecipeTag3 = "CoffeePlay" Then - ;Open "ROOT/taobin_project/xml/page_topping_select8.xml" + Open "ROOT/taobin_project/xml/page_topping_select8.xml" EndIf If BoxID = 200001 Then diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml index 4666a815..82565966 100644 --- a/xml/page_topping_select8.xml +++ b/xml/page_topping_select8.xml @@ -1890,7 +1890,7 @@ If EnableLightRoast = "Enable" Then Var CustomCoffeeEnable = "True" Var showCustomCoffee = "Enable" - var showCoffeeLevel = "Enable" + var showCoffeeQuantity = "Enable" If toppingID2Default = "" Then Var CustomCoffeeQuantityState[1] = "PressForever" @@ -4975,13 +4975,14 @@ Var topping2 = toppingID2index1 EndIf If CustomCoffeeQuantityState[1] = "PressForever" Then - Var topping2 = toppingID2index3 + Var topping2 = toppingID2index2 EndIf If CustomCoffeeQuantityState[2] = "PressForever" Then - Var topping2 = toppingID2index4 + Var topping2 = toppingID2index3 EndIf Else - If toppingID2index3 = 1060 Then + If toppingID2index3 = "" Then + Else Var topping2 = 0 EndIf EndIf @@ -5014,7 +5015,8 @@ Var topping10 = 0 EndIf Else - If toppingID2index3 = 1060 Then + If toppingID2index3 = "" Then + Else Var topping2 = 0 EndIf Var topping7 = 0 @@ -5558,10 +5560,10 @@ Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price1 EndIf If CustomCoffeeQuantityState[1] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price3 + Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 EndIf If CustomCoffeeQuantityState[2] = "PressForever" Then - Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price4 + Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price3 EndIf If CustomCoffeeLevelState[0] = "PressForever" Then