diff --git a/image/topping2/bd_add_Ovaltine.png b/image/topping2/bd_add_Ovaltine.png index af698ab6..33caa98d 100644 Binary files a/image/topping2/bd_add_Ovaltine.png and b/image/topping2/bd_add_Ovaltine.png differ diff --git a/image/topping2/bd_add_cocoa.png b/image/topping2/bd_add_cocoa.png new file mode 100644 index 00000000..5e3b133f Binary files /dev/null and b/image/topping2/bd_add_cocoa.png differ diff --git a/image/topping2/bd_add_oreo.png b/image/topping2/bd_add_oreo.png index 0ef66f8d..a3f3c1ae 100644 Binary files a/image/topping2/bd_add_oreo.png and b/image/topping2/bd_add_oreo.png differ diff --git a/image/topping2/bd_add_strawberry.png b/image/topping2/bd_add_strawberry.png new file mode 100644 index 00000000..bfefdc66 Binary files /dev/null and b/image/topping2/bd_add_strawberry.png differ diff --git a/image/topping2/bd_add_yuzu.png b/image/topping2/bd_add_yuzu.png new file mode 100644 index 00000000..0f4b678c Binary files /dev/null and b/image/topping2/bd_add_yuzu.png differ diff --git a/image/topping2/bn_add_cocoa.png b/image/topping2/bn_add_cocoa.png new file mode 100644 index 00000000..269d1dd4 Binary files /dev/null and b/image/topping2/bn_add_cocoa.png differ diff --git a/image/topping2/bn_add_oreo.png b/image/topping2/bn_add_oreo.png index cdb8fff2..c64561b5 100644 Binary files a/image/topping2/bn_add_oreo.png and b/image/topping2/bn_add_oreo.png differ diff --git a/image/topping2/bn_add_strawberry.png b/image/topping2/bn_add_strawberry.png new file mode 100644 index 00000000..d05b22e1 Binary files /dev/null and b/image/topping2/bn_add_strawberry.png differ diff --git a/image/topping2/bn_add_yuzu.png b/image/topping2/bn_add_yuzu.png new file mode 100644 index 00000000..cd8c6f01 Binary files /dev/null and b/image/topping2/bn_add_yuzu.png differ diff --git a/image/topping2/bp_add_cocoa.png b/image/topping2/bp_add_cocoa.png new file mode 100644 index 00000000..f515750c Binary files /dev/null and b/image/topping2/bp_add_cocoa.png differ diff --git a/image/topping2/bp_add_oreo.png b/image/topping2/bp_add_oreo.png index 6c1a271b..2c484710 100644 Binary files a/image/topping2/bp_add_oreo.png and b/image/topping2/bp_add_oreo.png differ diff --git a/image/topping2/bp_add_strawberry.png b/image/topping2/bp_add_strawberry.png new file mode 100644 index 00000000..17756ba2 Binary files /dev/null and b/image/topping2/bp_add_strawberry.png differ diff --git a/image/topping2/bp_add_yuzu.png b/image/topping2/bp_add_yuzu.png new file mode 100644 index 00000000..028a4083 Binary files /dev/null and b/image/topping2/bp_add_yuzu.png differ diff --git a/image/topping2/topping_revamp/Radio locked.png b/image/topping2/topping_revamp/Radio locked.png new file mode 100644 index 00000000..e8813d43 Binary files /dev/null and b/image/topping2/topping_revamp/Radio locked.png differ diff --git a/image/topping2/topping_revamp/alpha.png b/image/topping2/topping_revamp/alpha.png new file mode 100644 index 00000000..179ca7db Binary files /dev/null and b/image/topping2/topping_revamp/alpha.png differ diff --git a/image/topping2/topping_revamp/bg_bottom.png b/image/topping2/topping_revamp/bg_bottom.png new file mode 100644 index 00000000..c12033be Binary files /dev/null and b/image/topping2/topping_revamp/bg_bottom.png differ diff --git a/image/topping2/topping_revamp/bg_custom_cocoa_level.png b/image/topping2/topping_revamp/bg_custom_cocoa_level.png new file mode 100644 index 00000000..d6b89065 Binary files /dev/null and b/image/topping2/topping_revamp/bg_custom_cocoa_level.png differ diff --git a/image/topping2/topping_revamp/bg_custom_energy_level.png b/image/topping2/topping_revamp/bg_custom_energy_level.png new file mode 100644 index 00000000..2fd9a5b2 Binary files /dev/null and b/image/topping2/topping_revamp/bg_custom_energy_level.png differ diff --git a/image/topping2/topping_revamp/bg_custom_espesso_level.png b/image/topping2/topping_revamp/bg_custom_espesso_level.png new file mode 100644 index 00000000..93dfc78f Binary files /dev/null and b/image/topping2/topping_revamp/bg_custom_espesso_level.png differ diff --git a/image/topping2/topping_revamp/bg_custom_milk.png b/image/topping2/topping_revamp/bg_custom_milk.png new file mode 100644 index 00000000..005ad264 Binary files /dev/null and b/image/topping2/topping_revamp/bg_custom_milk.png differ diff --git a/image/topping2/topping_revamp/bg_custom_ovaltine.png b/image/topping2/topping_revamp/bg_custom_ovaltine.png new file mode 100644 index 00000000..9a9480fb Binary files /dev/null and b/image/topping2/topping_revamp/bg_custom_ovaltine.png differ diff --git a/image/topping2/topping_revamp/bg_custom_sweet_level.png b/image/topping2/topping_revamp/bg_custom_sweet_level.png new file mode 100644 index 00000000..73d31658 Binary files /dev/null and b/image/topping2/topping_revamp/bg_custom_sweet_level.png differ diff --git a/image/topping2/topping_revamp/bg_custom_topping_popup.png b/image/topping2/topping_revamp/bg_custom_topping_popup.png new file mode 100644 index 00000000..f6c6a67e Binary files /dev/null and b/image/topping2/topping_revamp/bg_custom_topping_popup.png differ diff --git a/image/topping2/topping_revamp/bg_exit.png b/image/topping2/topping_revamp/bg_exit.png new file mode 100644 index 00000000..18d29ba9 Binary files /dev/null and b/image/topping2/topping_revamp/bg_exit.png differ diff --git a/image/topping2/topping_revamp/bg_special_cocoa.png b/image/topping2/topping_revamp/bg_special_cocoa.png new file mode 100644 index 00000000..81e93be9 Binary files /dev/null and b/image/topping2/topping_revamp/bg_special_cocoa.png differ diff --git a/image/topping2/topping_revamp/bg_special_oreo.png b/image/topping2/topping_revamp/bg_special_oreo.png new file mode 100644 index 00000000..45040c33 Binary files /dev/null and b/image/topping2/topping_revamp/bg_special_oreo.png differ diff --git a/image/topping2/topping_revamp/bg_special_ovaltine.png b/image/topping2/topping_revamp/bg_special_ovaltine.png new file mode 100644 index 00000000..bb9c8493 Binary files /dev/null and b/image/topping2/topping_revamp/bg_special_ovaltine.png differ diff --git a/image/topping2/topping_revamp/bg_strawlid.png b/image/topping2/topping_revamp/bg_strawlid.png new file mode 100644 index 00000000..99f52cec Binary files /dev/null and b/image/topping2/topping_revamp/bg_strawlid.png differ diff --git a/image/topping2/topping_revamp/bg_syrup_straberry.png b/image/topping2/topping_revamp/bg_syrup_straberry.png new file mode 100644 index 00000000..90510df0 Binary files /dev/null and b/image/topping2/topping_revamp/bg_syrup_straberry.png differ diff --git a/image/topping2/topping_revamp/bg_syrup_yuzu.png b/image/topping2/topping_revamp/bg_syrup_yuzu.png new file mode 100644 index 00000000..be332032 Binary files /dev/null and b/image/topping2/topping_revamp/bg_syrup_yuzu.png differ diff --git a/image/topping2/topping_revamp/bg_top_cocoa.png b/image/topping2/topping_revamp/bg_top_cocoa.png new file mode 100644 index 00000000..25bd48af Binary files /dev/null and b/image/topping2/topping_revamp/bg_top_cocoa.png differ diff --git a/image/topping2/topping_revamp/bg_top_collagen.png b/image/topping2/topping_revamp/bg_top_collagen.png new file mode 100644 index 00000000..e77ced8d Binary files /dev/null and b/image/topping2/topping_revamp/bg_top_collagen.png differ diff --git a/image/topping2/topping_revamp/bg_top_custom.png b/image/topping2/topping_revamp/bg_top_custom.png new file mode 100644 index 00000000..38895635 Binary files /dev/null and b/image/topping2/topping_revamp/bg_top_custom.png differ diff --git a/image/topping2/topping_revamp/bg_top_custom_coffee.png b/image/topping2/topping_revamp/bg_top_custom_coffee.png new file mode 100644 index 00000000..34aa1366 Binary files /dev/null and b/image/topping2/topping_revamp/bg_top_custom_coffee.png differ diff --git a/image/topping2/topping_revamp/bg_top_custom_juicy_syrup.png b/image/topping2/topping_revamp/bg_top_custom_juicy_syrup.png new file mode 100644 index 00000000..d1a4ebf2 Binary files /dev/null and b/image/topping2/topping_revamp/bg_top_custom_juicy_syrup.png differ diff --git a/image/topping2/topping_revamp/bg_top_custom_recipe.png b/image/topping2/topping_revamp/bg_top_custom_recipe.png new file mode 100644 index 00000000..e039eb9b Binary files /dev/null and b/image/topping2/topping_revamp/bg_top_custom_recipe.png differ diff --git a/image/topping2/topping_revamp/bg_top_custom_syrup.png b/image/topping2/topping_revamp/bg_top_custom_syrup.png new file mode 100644 index 00000000..9799132d Binary files /dev/null and b/image/topping2/topping_revamp/bg_top_custom_syrup.png differ diff --git a/image/topping2/topping_revamp/bg_top_custom_topping.png b/image/topping2/topping_revamp/bg_top_custom_topping.png new file mode 100644 index 00000000..6434da0d Binary files /dev/null and b/image/topping2/topping_revamp/bg_top_custom_topping.png differ diff --git a/image/topping2/topping_revamp/bg_top_jemila_free.png b/image/topping2/topping_revamp/bg_top_jemila_free.png new file mode 100644 index 00000000..bfdc871c Binary files /dev/null and b/image/topping2/topping_revamp/bg_top_jemila_free.png differ diff --git a/image/topping2/topping_revamp/bg_top_oreo.png b/image/topping2/topping_revamp/bg_top_oreo.png new file mode 100644 index 00000000..f55ed2da Binary files /dev/null and b/image/topping2/topping_revamp/bg_top_oreo.png differ diff --git a/image/topping2/topping_revamp/bg_top_oreo2.png b/image/topping2/topping_revamp/bg_top_oreo2.png new file mode 100644 index 00000000..7d85d0fc Binary files /dev/null and b/image/topping2/topping_revamp/bg_top_oreo2.png differ diff --git a/image/topping2/topping_revamp/bg_top_ovaltine.png b/image/topping2/topping_revamp/bg_top_ovaltine.png new file mode 100644 index 00000000..ef393c30 Binary files /dev/null and b/image/topping2/topping_revamp/bg_top_ovaltine.png differ diff --git a/image/topping2/topping_revamp/bg_top_popup.png b/image/topping2/topping_revamp/bg_top_popup.png new file mode 100644 index 00000000..3c044be1 Binary files /dev/null and b/image/topping2/topping_revamp/bg_top_popup.png differ diff --git a/image/topping2/topping_revamp/bg_top_special_mix.png b/image/topping2/topping_revamp/bg_top_special_mix.png new file mode 100644 index 00000000..3baa5b30 Binary files /dev/null and b/image/topping2/topping_revamp/bg_top_special_mix.png differ diff --git a/image/topping2/topping_revamp/bn_accept.png b/image/topping2/topping_revamp/bn_accept.png new file mode 100644 index 00000000..64154ada Binary files /dev/null and b/image/topping2/topping_revamp/bn_accept.png differ diff --git a/image/topping2/topping_revamp/bn_accept2.png b/image/topping2/topping_revamp/bn_accept2.png new file mode 100644 index 00000000..23d897b4 Binary files /dev/null and b/image/topping2/topping_revamp/bn_accept2.png differ diff --git a/image/topping2/topping_revamp/bp_accept.png b/image/topping2/topping_revamp/bp_accept.png new file mode 100644 index 00000000..8016e2b0 Binary files /dev/null and b/image/topping2/topping_revamp/bp_accept.png differ diff --git a/image/topping2/topping_revamp/bp_accept2.png b/image/topping2/topping_revamp/bp_accept2.png new file mode 100644 index 00000000..6468448c Binary files /dev/null and b/image/topping2/topping_revamp/bp_accept2.png differ diff --git a/image/topping2/topping_revamp/cb_locked_new.png b/image/topping2/topping_revamp/cb_locked_new.png new file mode 100644 index 00000000..285246b2 Binary files /dev/null and b/image/topping2/topping_revamp/cb_locked_new.png differ diff --git a/image/topping2/topping_revamp/high_light_drink_type.png b/image/topping2/topping_revamp/high_light_drink_type.png new file mode 100644 index 00000000..5d548d91 Binary files /dev/null and b/image/topping2/topping_revamp/high_light_drink_type.png differ diff --git a/image/topping2_en/topping_revamp/bg_custom_cocoa_level.png b/image/topping2_en/topping_revamp/bg_custom_cocoa_level.png new file mode 100644 index 00000000..8502cf1f Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_custom_cocoa_level.png differ diff --git a/image/topping2_en/topping_revamp/bg_custom_energy_level.png b/image/topping2_en/topping_revamp/bg_custom_energy_level.png new file mode 100644 index 00000000..ee2d33d5 Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_custom_energy_level.png differ diff --git a/image/topping2_en/topping_revamp/bg_custom_espesso_level.png b/image/topping2_en/topping_revamp/bg_custom_espesso_level.png new file mode 100644 index 00000000..b7e5deae Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_custom_espesso_level.png differ diff --git a/image/topping2_en/topping_revamp/bg_custom_milk.png b/image/topping2_en/topping_revamp/bg_custom_milk.png new file mode 100644 index 00000000..2653ca78 Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_custom_milk.png differ diff --git a/image/topping2_en/topping_revamp/bg_custom_ovaltine.png b/image/topping2_en/topping_revamp/bg_custom_ovaltine.png new file mode 100644 index 00000000..3a8afc55 Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_custom_ovaltine.png differ diff --git a/image/topping2_en/topping_revamp/bg_custom_sweet_level.png b/image/topping2_en/topping_revamp/bg_custom_sweet_level.png new file mode 100644 index 00000000..4f8c681a Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_custom_sweet_level.png differ diff --git a/image/topping2_en/topping_revamp/bg_special_cocoa.png b/image/topping2_en/topping_revamp/bg_special_cocoa.png new file mode 100644 index 00000000..ab2026b8 Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_special_cocoa.png differ diff --git a/image/topping2_en/topping_revamp/bg_special_oreo.png b/image/topping2_en/topping_revamp/bg_special_oreo.png new file mode 100644 index 00000000..0c59ec34 Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_special_oreo.png differ diff --git a/image/topping2_en/topping_revamp/bg_special_ovaltine.png b/image/topping2_en/topping_revamp/bg_special_ovaltine.png new file mode 100644 index 00000000..52d1b88d Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_special_ovaltine.png differ diff --git a/image/topping2_en/topping_revamp/bg_strawlid.png b/image/topping2_en/topping_revamp/bg_strawlid.png new file mode 100644 index 00000000..92e23ea8 Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_strawlid.png differ diff --git a/image/topping2_en/topping_revamp/bg_syrup_straberry.png b/image/topping2_en/topping_revamp/bg_syrup_straberry.png new file mode 100644 index 00000000..78417287 Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_syrup_straberry.png differ diff --git a/image/topping2_en/topping_revamp/bg_syrup_yuzu.png b/image/topping2_en/topping_revamp/bg_syrup_yuzu.png new file mode 100644 index 00000000..710e534e Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_syrup_yuzu.png differ diff --git a/image/topping2_en/topping_revamp/bg_top_cocoa.png b/image/topping2_en/topping_revamp/bg_top_cocoa.png new file mode 100644 index 00000000..914039c9 Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_top_cocoa.png differ diff --git a/image/topping2_en/topping_revamp/bg_top_custom_recipe.png b/image/topping2_en/topping_revamp/bg_top_custom_recipe.png new file mode 100644 index 00000000..ffde9885 Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_top_custom_recipe.png differ diff --git a/image/topping2_en/topping_revamp/bg_top_custom_syrup.png b/image/topping2_en/topping_revamp/bg_top_custom_syrup.png new file mode 100644 index 00000000..73c2a013 Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_top_custom_syrup.png differ diff --git a/image/topping2_en/topping_revamp/bg_top_jemila_free.png b/image/topping2_en/topping_revamp/bg_top_jemila_free.png new file mode 100644 index 00000000..32c62853 Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_top_jemila_free.png differ diff --git a/image/topping2_en/topping_revamp/bg_top_oreo.png b/image/topping2_en/topping_revamp/bg_top_oreo.png new file mode 100644 index 00000000..9975a46e Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_top_oreo.png differ diff --git a/image/topping2_en/topping_revamp/bg_top_ovaltine.png b/image/topping2_en/topping_revamp/bg_top_ovaltine.png new file mode 100644 index 00000000..e4990db2 Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_top_ovaltine.png differ diff --git a/image/topping2_en/topping_revamp/bg_top_popup.png b/image/topping2_en/topping_revamp/bg_top_popup.png new file mode 100644 index 00000000..577a447b Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_top_popup.png differ diff --git a/image/topping2_en/topping_revamp/bg_top_special_mix.png b/image/topping2_en/topping_revamp/bg_top_special_mix.png new file mode 100644 index 00000000..a81d2e71 Binary files /dev/null and b/image/topping2_en/topping_revamp/bg_top_special_mix.png differ diff --git a/image/topping2_en/topping_revamp/bn_accept.png b/image/topping2_en/topping_revamp/bn_accept.png new file mode 100644 index 00000000..b4d921dd Binary files /dev/null and b/image/topping2_en/topping_revamp/bn_accept.png differ diff --git a/image/topping2_en/topping_revamp/bn_accept2.png b/image/topping2_en/topping_revamp/bn_accept2.png new file mode 100644 index 00000000..1e7b237b Binary files /dev/null and b/image/topping2_en/topping_revamp/bn_accept2.png differ diff --git a/image/topping2_en/topping_revamp/bn_add_jemila.png b/image/topping2_en/topping_revamp/bn_add_jemila.png new file mode 100644 index 00000000..45d0550c Binary files /dev/null and b/image/topping2_en/topping_revamp/bn_add_jemila.png differ diff --git a/image/topping2_en/topping_revamp/bp_accept.png b/image/topping2_en/topping_revamp/bp_accept.png new file mode 100644 index 00000000..1897862d Binary files /dev/null and b/image/topping2_en/topping_revamp/bp_accept.png differ diff --git a/image/topping2_en/topping_revamp/bp_accept2.png b/image/topping2_en/topping_revamp/bp_accept2.png new file mode 100644 index 00000000..90b14ffd Binary files /dev/null and b/image/topping2_en/topping_revamp/bp_accept2.png differ diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml index 7a39a73e..a54386e4 100644 --- a/xml/page_topping_select8.xml +++ b/xml/page_topping_select8.xml @@ -74,19 +74,36 @@ Var showShotEnable = "Invisible" Var ShotCoffeePremium = "Invisible" - Var showOreoAddEnable = "Invisible" + Var showCustomCoffee = "Invisible" + + + Var showOvaltineEnable = "Invisible" + Var showOreoAddEnable = "Invisible" + Var showCocoaEnable = "Invisible" + Var showJemilaEnable = "Invisible" + + Var showStrawberryEnable = "Invisible" + Var showYuzuEnable = "Invisible" + + Var SpecialMix = "Invisible" + Var CustomSyrup = "Invisible" + + ; Customer Coffee Var CustomCoffeeEnable = "False" Var EnableLightRoast = "Disable" Var showCoffeeWater = "Invisible" + Var showSweetLevel = "Invisible" Var showCoffeeQuantity = "Invisible" Var showCoffeeLevel = "Invisible" Var showCoffeeTamping = "Invisible" + + ; States Var CustomCoffeeWaterState[0] = "Enable" Var CustomCoffeeWaterState[1] = "Enable" @@ -107,9 +124,60 @@ Var CustomCoffeeTampingState[1] = "Enable" Var CustomCoffeeTampingState[2] = "Enable" + Var CustomSweetState[0] = "Invisible" + Var CustomSweetState[1] = "Invisible" + Var CustomSweetState[2] = "Invisible" + Var CustomSweetState[3] = "Invisible" + Var CustomSweetState[4] = "Invisible" + Var CustomSweetState[5] = "Invisible" + + + Var CustomEspressoState[0] = "Enable" + Var CustomEspressoState[1] = "Enable" + + Var CustomEnaergyState[0] = "Enable" + Var CustomEnaergyState[1] = "Enable" + + Var CustomCocoaState[0] = "Enable" + Var CustomCocoaState[1] = "Enable" + Var CustomCocoaState[2] = "Enable" + + + Var CustomOvaltineState[0] = "Enable" + Var CustomOvaltineState[1] = "Enable" + Var CustomOvaltineState[2] = "Enable" + + + Var CustomMilkState[0] = "Enable" + Var CustomMilkState[1] = "Enable" + Var CustomMilkState[2] = "Enable" + + ; Texts Var CustomCoffeeTextY = 47 + Var CustomSweetTextY = 52 + Var CustomSweetPercentTextY = 52 + Var CustomEspressoTextY = 52 + + Var CustoppopupToppingY = 880 + Var CustoppopupToppingNextY = 180 + + Var CustomOreoState = "Invisible" + Var CustomOvaltineState = "Invisible" + Var CustomCocoaState = "Invisible" + Var CustomCollagenState = "Invisible" + + Var CustomOreoCheckState = "Invisible" + Var CustomOvaltineCheckState = "Invisible" + Var CustomCocoaCheckState = "Invisible" + + + + + Var PopupToppingSelect = "Invisible" + Var custom_coffee_offset_text_x = 0 + Var CustomCoffeeWaterText[0] = "20ml" @@ -122,6 +190,23 @@ Var CustomCoffeeQuantityText[1] = "13g" Var CustomCoffeeQuantityText[2] = "16g" + + + + + + + Var CustomSweetrPercent[0] = "(0%)" + Var CustomSweetrPercent[1] = "(30%)" + Var CustomSweetrPercent[2] = "(60%)" + Var CustomSweetrPercent[3] = "(100%)" + Var CustomSweetrPercent[4] = "(120%)" + Var CustomSweetrPercent[5] = "(140%)" + + + + + ; End Customer Coffee Var BGSugarHotHealthy = "Invisible" @@ -160,6 +245,10 @@ Var showname = NameDrink Var showdesc = DrinkDescription + Var bnAccept = "ROOT/taobin_project/image/topping2_en/topping_revamp/bn_accept2.png" + Var bpAccept = "ROOT/taobin_project/image/topping2_en/topping_revamp/bp_accept2.png" + Var bnAcceptX = 360 + Var text_show_thai = "Invisible" Var text_show_eng = "Enable" @@ -179,12 +268,62 @@ Var CustomCoffeeTampingText[0] = "Light" Var CustomCoffeeTampingText[1] = "Medium" Var CustomCoffeeTampingText[2] = "Hight" + + Var CustomSweetrText[0] = "Not sweet" + Var CustomSweetrText[1] = "Little" + Var CustomSweetrText[2] = "Less" + Var CustomSweetrText[3] = "Perfect" + Var CustomSweetrText[4] = "Extra" + Var CustomSweetrText[5] = "Sweetest" + + + Var CustomEspressoText[0] = "1 Shot" + Var CustomEspressoText[1] = "2 Shot" + Var CustomEspressoText[2] = "3 Shot" + + Var CustomCocoaText[0] = "Cocoa X2" + Var CustomCocoaText[1] = "Cocoa X3" + Var CustomCocoaText[2] = "Cocoa X10" + + + Var CustomOvaltineText[0] = "Ovaltine X2" + Var CustomOvaltineText[1] = "Ovaltine X3" + Var CustomOvaltineText[2] = "Ovaltine X10" + + Var CustomMilkText[0] = "Light" + Var CustomMilkText[1] = "Normal" + Var CustomMilkText[2] = "Rich" + + Var custom_coffee_level_medium_text_x = 540 Var custom_coffee_level_medium_price_x = 600 + + Var custom_coffee_level_darker_text_x = 880 Var custom_coffee_level_dark_text_x = 785 + + Var CustomSweetNotTextX = 310 + Var CustomSweetNotPercentTextX = 388 + + + Var CustomSweetLittleTextX = 442 + Var CustomSweetLittlePercentTextX = 488 + + + Var CustomSweetLessTextX = 553 + Var CustomSweetLessPercentTextX = 595 + + Var CustomSweetPerfectTextX = 660 + Var CustomSweetPerfectPercentTextX = 715 + + Var CustomSweetExtraTextX = 775 + Var CustomSweetExtraPercentTextX = 815 + + + Var CustomSweetestTextX = 865 + Var CustomSweetestPercentTextX = 935 Else Var DirImage = "ROOT/taobin_project/image/topping2" @@ -193,6 +332,12 @@ Var showname = NameDrinkTH Var showdesc = DrinkDescriptionTH + Var bnAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bn_accept2.png" + Var bpAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bp_accept2.png" + Var bnAcceptX = 360 + + + Var text_show_thai = "Enable" Var text_show_eng = "Invisible" @@ -213,16 +358,61 @@ Var CustomCoffeeTampingText[1] = "ปานกลาง" Var CustomCoffeeTampingText[2] = "เน้น" + + Var CustomSweetrText[0] = "ไม่หวาน" + Var CustomSweetrText[1] = "จุบจิบ" + Var CustomSweetrText[2] = "น้อย" + Var CustomSweetrText[3] = "พอดี" + Var CustomSweetrText[4] = "จึ้ง" + Var CustomSweetrText[5] = "สุขิต" + + + Var CustomEspressoText[0] = "1 ช็อต" + Var CustomEspressoText[1] = "2 ช็อต" + Var CustomEspressoText[2] = "3 ช็อต" + + Var CustomCocoaText[0] = "โกโก้ X2" + Var CustomCocoaText[1] = "โกโก้ X3" + Var CustomCocoaText[2] = "โกโก้ X10" + + + Var CustomOvaltineText[0] = "โอวัลติน X2" + Var CustomOvaltineText[1] = "โอวัลติน X3" + Var CustomOvaltineText[2] = "โอวัลติน X10" + + Var CustomMilkText[0] = "ไลท์" + Var CustomMilkText[1] = "ปกติ" + Var CustomMilkText[2] = "ข้นมัน" + + Var custom_coffee_level_medium_text_x = 560 Var custom_coffee_level_medium_price_x = 600 Var custom_coffee_level_darker_text_x = 880 Var custom_coffee_level_dark_text_x = 790 + + Var CustomSweetNotTextX = 331 + Var CustomSweetNotPercentTextX = 388 + + Var CustomSweetLittleTextX = 445 + Var CustomSweetLittlePercentTextX = 488 + + Var CustomSweetLessTextX = 560 + Var CustomSweetLessPercentTextX = 595 + + Var CustomSweetPerfectTextX = 675 + Var CustomSweetPerfectPercentTextX = 710 + + Var CustomSweetExtraTextX = 795 + Var CustomSweetExtraPercentTextX = 820 + + Var CustomSweetestTextX = 900 + Var CustomSweetestPercentTextX = 935 EndIf Var text_x_free_topping = text_x_add_oreo_price + text_x_free_adjust - Var bg_strawlid = DirImage + "/bg_strawlid.png" + Var bg_strawlid = DirImage + "/topping_revamp/bg_strawlid.png" Var bg_straw_only = DirImage + "/bg_straw_only.png" Var bg_lid_only = DirImage + "/bg_lid_only.png" @@ -242,7 +432,7 @@ ;Var ShowLidStraw = "Enable" ;Var ShowStrawOnly = "Enable" ;Var ShowLidOnly = "Enable" - + Var ShiftSugarStep = 1 @@ -298,6 +488,11 @@ Var NEW_MULTI = "Invisible" Var high_light_drink_type = "Invisible" + Var toppingSelectState = "Invisible" + + Var SelectToppingType = 0 + Var SelectedToppingCount = 0 + Var SelectSyrupType = 0 Var text_hot_color = "0x84776F" Var text_cold_color = "0x84776F" @@ -378,6 +573,7 @@ Var img_smth_dis2 = "/bt_smoothie_disable2_no.png" + Var CerealMilkEnable = "Enable" Var topping_price_refresh = 1 @@ -431,6 +627,8 @@ Var CerealMilkX = 270 EndIf + + 1000 @@ -440,6 +638,8 @@ DEBUGVAR CupRemain DEBUGVAR FreePowerup + DEBUGVAR showSweetLevel + If SelectDrinkType = 1 Then If MenuReady = "YES" Then @@ -458,15 +658,25 @@ Var PriceDrinkTmpShow = "Free" EndIf EndIf - + DEBUGVAR Seeker If Seeker = "next" Then + If CupRemain > 0 Then + If SelectToppingType = 1 Then + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" + Open "ROOT/taobin_project/xml/page_payment.xml" + Else + If blend_button_state = "PressForever" Then + Var toppingSelectState = "Enable" + EndIf + + EndIf + EndIf + Else + If SelectToppingType = 1 Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" Open "ROOT/taobin_project/xml/page_payment.xml" EndIf - Else - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" - Open "ROOT/taobin_project/xml/page_payment.xml" EndIf EndIf @@ -487,7 +697,7 @@ EndIf - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" + ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" Else @@ -525,7 +735,7 @@ EndIf - + DEBUGVAR NoWaitMachineEnable If NoWaitMachineEnable = 1 Then DEBUGVAR MachineStage DEBUGVAR ConfirmDrinkButtonState @@ -540,11 +750,13 @@ EndIf Else - + EndIf + DEBUGVAR bnAccept + If show_eng = "true" Then If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then Var ShowTextSelfTestCountDown = "Please wait a moment (" + MACHINE_SELF_TEST_COUNT_DOWN @@ -561,6 +773,43 @@ EndIf EndIf + + Var oreo_y = 1060 + Var oreo_button_y = 1070 + Var oreo_text_y = 1085 + + Var ovaltine_y = 1060 + Var ovaltine_button_y = 1070 + Var ovaltine_text_y = 1085 + + Var cocoa_y = 1060 + Var cocoa_button_y = 1070 + Var cocoa_text_y = 1085 + + Var bottom_y = 1060 + Var accept_y = 1075 + + Var offset = 0 + If CustomOreoState = "Enable" Then + Var offset = offset + 72 + Var ovaltine_y = 1060 + offset + Var ovaltine_button_y = 1070 + offset + Var ovaltine_text_y = 1085 + offset + EndIf + + If CustomOvaltineState = "Enable" Then + Var offset = offset + 72 + Var cocoa_y = 1060 + offset + Var cocoa_button_y = 1070 + offset + Var cocoa_text_y = 1085 + offset + EndIf + + If CustomCocoaState = "Enable" Then + Var offset = offset + 72 + Var bottom_y = 1060 + offset + Var accept_y = 1075 + offset + EndIf + Refresh TimerReset @@ -577,7 +826,8 @@ DEBUGVAR MAT_ID_9701 @@ -838,6 +1151,10 @@ DEBUGVAR toppingID10index1 DEBUGVAR toppingID10index2 DEBUGVAR toppingID10index3 + + DEBUGVAR toppingID11index1 + DEBUGVAR toppingID11index2 + DEBUGVAR toppingID11index3 If toppingID1index5 > 0 Then SAVELOG "toppingID1index5 not set" @@ -886,13 +1203,104 @@ DEBUGVAR BrewParam DEBUGVAR UserSeletedSugar + Var ExtraTopping = "Enable" If BugFlag = 1 Then Else - If TOPPING6 = "Topping-Volcano" Then + + If toppingID6price2 > 0 Then + DEBUGVAR toppingID6price2 + DEBUGVAR DisplayFormat + + Var toppingID6price2Conv !assigned StringFmt( toppingID6price2 , DisplayFormat, PreScaleConvertShow) + + DEBUGVAR toppingID6price2Conv + + Var text_price_6 = "" + + Var text_price_6 = toppingID6price2Conv + ")" + Var text_price_6 = "(+" + text_price_6 + + + + DEBUGVAR text_price_6 + Else + + Var text_price_6 = "" + EndIf + + + + If blend_button_state = "PressForever" Then + Var SpecialMix = "Enable" + Var CustomSyrup = "Enable" + + Var showOreoAddEnable = "Enable" + Var showOvaltineEnable = "Enable" + Var showCocoaEnable = "Enable" + + Var showStrawberryEnable = "Enable" + Var showYuzuEnable = "Enable" + + Var showText8 = "Invisible" + +; Var showCustomCoffee = "Enable" + +; Var showCoffeeWater = "Enable" +; Var showCoffeeQuantity = "Enable" +; Var showCoffeeLevel = "Enable" +; Var showCoffeeTamping = "Enable" + + If toppingSelectState = "Enable" Then + Var CustomOreoState = "Enable" + Var CustomOvaltineState = "Enable" + Var CustomCocoaState = "Enable" + Var CustomCollagenState = "Enable" + + Var PopupToppingSelect = "Enable" + + + Var CustomOreoCheckState = "Enable" + Var CustomOvaltineCheckState = "Enable" + Var CustomCocoaCheckState = "Enable" + EndIf + Else + ;Var showOreoAddEnable = "Disable" + ;Var showOvaltineEnable = "Disable" + Var showText8 = "Enable" + +; Var showCustomCoffee = "Invisible" + +; Var showCoffeeWater = "Invisible" +; Var showCoffeeQuantity = "Invisible" +; Var showCoffeeLevel = "Invisible" +; Var showCoffeeTamping = "Invisible" + EndIf + + + + + Var ExtraTopping = "Enable" + + + If blend_button_state = "Disable2" Then + If hot_button_state = "Disable2" Then + If cold_button_state = "PressForever" Then + Var showOreoAddEnable = "Enable" + Var showOvaltineEnable = "Enable" + Var showCocoaEnable = "Enable" + Var showText8 = "Invisible" + EndIf + EndIf + EndIf + + + EndIf + + If TOPPING6 = "all-volcano" Then If toppingID6price2 > 0 Then DEBUGVAR toppingID6price2 @@ -914,10 +1322,19 @@ Var text_price_6 = "" EndIf + If blend_button_state = "PressForever" Then - + Var SpecialMix = "Enable" + Var CustomSyrup = "Enable" + Var showOreoAddEnable = "Enable" + Var showOvaltineEnable = "Enable" + Var showCocoaEnable = "Enable" + + Var showStrawberryEnable = "Enable" + Var showYuzuEnable = "Enable" + Var showText8 = "Invisible" ; Var showCustomCoffee = "Enable" @@ -926,8 +1343,23 @@ ; Var showCoffeeQuantity = "Enable" ; Var showCoffeeLevel = "Enable" ; Var showCoffeeTamping = "Enable" + + If toppingSelectState = "Enable" Then + Var CustomOreoState = "Enable" + Var CustomOvaltineState = "Enable" + Var CustomCocoaState = "Enable" + Var CustomCollagenState = "Enable" + + Var PopupToppingSelect = "Enable" + + + Var CustomOreoCheckState = "Enable" + Var CustomOvaltineCheckState = "Enable" + Var CustomCocoaCheckState = "Enable" + EndIf Else - Var showOreoAddEnable = "Disable" + ;Var showOreoAddEnable = "Disable" + ;Var showOvaltineEnable = "Disable" Var showText8 = "Enable" ; Var showCustomCoffee = "Invisible" @@ -938,6 +1370,8 @@ ; Var showCoffeeTamping = "Invisible" EndIf + + Var ExtraTopping = "Enable" @@ -946,14 +1380,61 @@ If hot_button_state = "Disable2" Then If cold_button_state = "PressForever" Then Var showOreoAddEnable = "Enable" + Var showOvaltineEnable = "Enable" + Var showCocoaEnable = "Enable" Var showText8 = "Invisible" EndIf EndIf EndIf + + EndIf DEBUGVAR SubMenuGroupIDSlot6_1 + DEBUGVAR TOPPING3 + If TOPPING3 = "Collagen(mix)" Then + If JemilaToppingFlag = 1 Then + + If hot_button_state = "PressForever" Then + Var CollagenState = "Disable" + EndIf + + If cold_button_state = "PressForever" Then + If CollagenState = "Invisible" Then + Var CollagenState = "Enable" + EndIf + If CollagenState = "Disable" Then + Var CollagenState = "Enable" + EndIf + EndIf + + If blend_button_state = "PressForever" Then + If CollagenState = "Invisible" Then + Var CollagenState = "Enable" + EndIf + If CollagenState = "Disable" Then + Var CollagenState = "Enable" + EndIf + EndIf + + If JemilaToppingFreeFlag = 1 Then + Var CollagenToppingBg = "/bg_top_jemila_free.png" + Var CollagenToppingPrice = 0 + Else + Var CollagenToppingBg = "/bg_top_jemila.png" + Var CollagenToppingPrice = 5 + EndIf + Else + Var CollagenState = "Invisible" + EndIf + Else + Var CollagenState = "Invisible" + Var ShowCollagenOnly = "Invisible" + EndIf + + DEBUGVAR CollagenState + Var PriceCustomCoffeeFormat = "%.0f฿" If TOPPING7 = "water-level" Then @@ -1205,6 +1686,11 @@ EndIf EndIf + If cold_button_state = "PressForever" Then + Var showStrawberryEnable = "Enable" + Var showYuzuEnable = "Enable" + EndIf + ; i f Hot menu disable away @@ -1215,14 +1701,120 @@ If showOreoAddEnable = "Press" Then Var showOreoAddEnable = "Disable" EndIf + + If showOvaltineEnable = "Enable" Then + Var showOvaltineEnable = "Disable" + EndIf + If showOvaltineEnable = "Press" Then + Var showOvaltineEnable = "Disable" + EndIf + + If showCocoaEnable = "Enable" Then + Var showCocoaEnable = "Disable" + EndIf + If showCocoaEnable = "Press" Then + Var showCocoaEnable = "Disable" + EndIf + + + If showStrawberryEnable = "Enable" Then + Var showStrawberryEnable = "Disable" + EndIf + If showStrawberryEnable = "Press" Then + Var showStrawberryEnable = "Disable" + EndIf + + If showYuzuEnable = "Enable" Then + Var showYuzuEnable = "Disable" + EndIf + If showYuzuEnable = "Press" Then + Var showYuzuEnable = "Disable" + EndIf + + If CustomMilkState[0] = "Enable" Then + If CustomMilkState[1] = "Enable" Then + If CustomMilkState[2] = "Enable" Then + Var CustomMilkState[1] = "PressForever" Then + EndIf + EndIf + EndIf + + Var SelectToppingType = 1 + EndIf + + + ; i f cold menu disable away + + If cold_button_state = "PressForever" Then + If showOreoAddEnable = "Enable" Then + Var showOreoAddEnable = "Disable" + EndIf + If showOreoAddEnable = "Press" Then + Var showOreoAddEnable = "Disable" + EndIf + + + If showOvaltineEnable = "Enable" Then + Var showOvaltineEnable = "Disable" + EndIf + If showOvaltineEnable = "Press" Then + Var showOvaltineEnable = "Disable" + EndIf + + If showCocoaEnable = "Enable" Then + Var showCocoaEnable = "Disable" + EndIf + If showCocoaEnable = "Press" Then + Var showCocoaEnable = "Disable" + EndIf + + If showStrawberryEnable = "Enable" Then + Var showStrawberryEnable = "Disable" + EndIf + If showStrawberryEnable = "Press" Then + Var showStrawberryEnable = "Disable" + EndIf + + If showYuzuEnable = "Enable" Then + Var showYuzuEnable = "Disable" + EndIf + If showYuzuEnable = "Press" Then + Var showYuzuEnable = "Disable" + EndIf + + If CustomMilkState[0] = "Enable" Then + If CustomMilkState[1] = "Enable" Then + If CustomMilkState[2] = "Enable" Then + Var CustomMilkState[1] = "PressForever" Then + EndIf + EndIf + EndIf + + Var SelectToppingType = 1 EndIf ; first time. If blend_button_state = "PressForever" Then + If CustomMilkState[0] = "Enable" Then + If CustomMilkState[1] = "Enable" Then + If CustomMilkState[2] = "Enable" Then + Var CustomMilkState[1] = "PressForever" Then + EndIf + EndIf + EndIf + + Var SelectToppingType = 0 + Var SelectedToppingCount = 0 Else If SubMenuGroupIDSlot6_1 = 300 Then Var showOreoAddEnable = "Disable" + Var showOvaltineEnable = "Disable" + Var showCocoaEnable = "Disable" + + Var showYuzuEnable = "Disable" + Var showStrawberryEnable = "Disable" + Var showText8 = "Enable" Var ExtraTopping = "Enable" EndIf @@ -1318,6 +1910,13 @@ Var SugarState4 = "Enable" Var SugarState5 = "Enable" Var SugarState6 = "Enable" + + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" EndIf Var sugar_default_flag = 0 @@ -1334,28 +1933,39 @@ Var SugarState3 = "Enable" Var SugarState4 = "Enable" + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + + If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" + Var CustomSweetState[0] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index2 = toppingID1Default Then Var SugarState2 = "PressForever" + Var CustomSweetState[1] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index3 = toppingID1Default Then Var SugarState3 = "PressForever" + Var CustomSweetState[2] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index4 = toppingID1Default Then Var SugarState4 = "PressForever" + Var CustomSweetState[3] = "PressForever" Var sugar_default_flag = 1 EndIf If sugar_default_flag = 0 Then Var SugarState1 = "PressForever" + Var CustomSweetState[0] = "PressForever" EndIf EndIf @@ -1371,28 +1981,39 @@ Var SugarState3 = "Enable" Var SugarState4 = "Enable" + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + + If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" + Var CustomSweetState[0] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index2 = toppingID1Default Then Var SugarState2 = "PressForever" + Var CustomSweetState[1] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index3 = toppingID1Default Then Var SugarState3 = "PressForever" + Var CustomSweetState[2] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index4 = toppingID1Default Then Var SugarState4 = "PressForever" + Var CustomSweetState[3] = "PressForever" Var sugar_default_flag = 1 EndIf If sugar_default_flag = 0 Then Var SugarState1 = "PressForever" + Var CustomSweetState[0] = "PressForever" EndIf EndIf @@ -1414,33 +2035,46 @@ Var SugarState4 = "Enable" Var SugarState5 = "Enable" + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + + If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" + Var CustomSweetState[0] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index2 = toppingID1Default Then Var SugarState2 = "PressForever" + Var CustomSweetState[1] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index3 = toppingID1Default Then Var SugarState3 = "PressForever" + Var CustomSweetState[2] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index4 = toppingID1Default Then Var SugarState4 = "PressForever" + Var CustomSweetState[3] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index5 = toppingID1Default Then Var SugarState5 = "PressForever" + Var CustomSweetState[4] = "PressForever" Var sugar_default_flag = 1 EndIf If sugar_default_flag = 0 Then Var SugarState1 = "PressForever" + Var CustomSweetState[0] = "PressForever" EndIf EndIf @@ -1461,33 +2095,46 @@ Var SugarState4 = "Enable" Var SugarState5 = "Enable" + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + + If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" + Var CustomSweetState[0] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index2 = toppingID1Default Then Var SugarState2 = "PressForever" + Var CustomSweetState[1] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index3 = toppingID1Default Then Var SugarState3 = "PressForever" + Var CustomSweetState[2] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index4 = toppingID1Default Then Var SugarState4 = "PressForever" + Var CustomSweetState[3] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index5 = toppingID1Default Then Var SugarState5 = "PressForever" + Var CustomSweetState[4] = "PressForever" Var sugar_default_flag = 1 EndIf If sugar_default_flag = 0 Then Var SugarState1 = "PressForever" + Var CustomSweetState[0] = "PressForever" EndIf EndIf @@ -1509,35 +2156,48 @@ Var SugarState5 = "Enable" Var SugarState6 = "Enable" + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" + DEBUGVAR "set default Powder Sugar" If toppingID1index1 = toppingID1Default Then Var SugarState1 = "PressForever" + Var CustomSweetState[0] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index2 = toppingID1Default Then Var SugarState2 = "PressForever" + Var CustomSweetState[1] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index3 = toppingID1Default Then Var SugarState3 = "PressForever" + Var CustomSweetState[2] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index4 = toppingID1Default Then Var SugarState4 = "PressForever" + Var CustomSweetState[3] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index5 = toppingID1Default Then Var SugarState5 = "PressForever" + Var CustomSweetState[4] = "PressForever" Var sugar_default_flag = 1 EndIf If sugar_default_flag = 0 Then Var SugarState1 = "PressForever" + Var CustomSweetState[0] = "PressForever" EndIf DEBUGVAR toppingID1Default @@ -1562,29 +2222,41 @@ Var SugarState4 = "Enable" Var SugarState5 = "Enable" Var SugarState6 = "Enable" + + Var CustomSweetState[0] = "Disable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" If toppingID1index1 = toppingID1Default Then Var SugarState2 = "PressForever" + Var CustomSweetState[1] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index2 = toppingID1Default Then Var SugarState3 = "PressForever" + Var CustomSweetState[2] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index3 = toppingID1Default Then Var SugarState4 = "PressForever" + Var CustomSweetState[3] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index4 = toppingID1Default Then Var SugarState5 = "PressForever" + Var CustomSweetState[4] = "PressForever" Var sugar_default_flag = 1 EndIf If sugar_default_flag = 0 Then Var SugarState2 = "PressForever" + Var CustomSweetState[1] = "PressForever" EndIf EndIf @@ -1602,30 +2274,44 @@ Var SugarState2 = "Disable" If RecipeTag2 = "Topping6Step" Then Var SugarState3 = "Disable" + Var CustomSweetState[2] = "Disable" Else Var SugarState3 = "Enable" + Var CustomSweetState[2] = "Enable" EndIf Var SugarState4 = "Enable" Var SugarState5 = "Enable" Var SugarState6 = "Enable" + + Var CustomSweetState[0] = "Disable" + Var CustomSweetState[1] = "Disable" + + + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + Var CustomSweetState[5] = "Enable" If toppingID1index1 = toppingID1Default Then Var SugarState3 = "PressForever" + Var CustomSweetState[2] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index2 = toppingID1Default Then Var SugarState4 = "PressForever" + Var CustomSweetState[3] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index3 = toppingID1Default Then Var SugarState5 = "PressForever" + Var CustomSweetState[4] = "PressForever" Var sugar_default_flag = 1 EndIf If sugar_default_flag = 0 Then Var SugarState3 = "PressForever" + Var CustomSweetState[2] = "PressForever" EndIf EndIf @@ -1641,33 +2327,44 @@ Var ShiftSugarStep = 2 Var SugarState2 = "Enable" - Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" + + + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" + If toppingID1index1 = toppingID1Default Then Var SugarState2 = "PressForever" + Var CustomSweetState[1] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index2 = toppingID1Default Then Var SugarState3 = "PressForever" + Var CustomSweetState[2] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index3 = toppingID1Default Then Var SugarState4 = "PressForever" + Var CustomSweetState[3] = "PressForever" Var sugar_default_flag = 1 EndIf If toppingID1index4 = toppingID1Default Then Var SugarState5 = "PressForever" + Var CustomSweetState[4] = "PressForever" Var sugar_default_flag = 1 EndIf If sugar_default_flag = 0 Then Var SugarState2 = "PressForever" + Var CustomSweetState[1] = "PressForever" EndIf EndIf @@ -1731,6 +2428,12 @@ Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" + + Var CustomSweetState[0] = "Enable" + Var CustomSweetState[1] = "Enable" + Var CustomSweetState[2] = "Enable" + Var CustomSweetState[3] = "Enable" + Var CustomSweetState[4] = "Enable" EndIf Else @@ -1764,7 +2467,7 @@ Refresh EndIf - + If TOPPING2 = "shot coffee termtem" Then Var ShotCoffeeBG = "Enable" @@ -2025,7 +2728,6 @@ Var ExtraTopping = "Enable" EndIf - SAVELOG ToppingGotoPayment If ToppingGotoPayment = "true" Then @@ -2038,6 +2740,12 @@ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" Open "ROOT/taobin_project/xml/page_payment.xml" EndIf + + If SelectDrinkType = 0 Then + Var showSweetLevel = "Enable" + Var showEspressoLevel = "Enable" + EndIf + If RoadShow = "true" Then @@ -2053,10 +2761,15 @@ DEBUGVAR toppingID2price1 DEBUGVAR toppingID2price2 DEBUGVAR toppingID2price3 + Var CustomCoffeeQuantityAdditionalPrice = "(25฿)" Function 2 EndIf + + DEBUGVAR ExtraTopping + + @@ -2083,17 +2796,58 @@ ; same - 374 - 382 - 331 - 436 + 45 + 402 + 291 + 396 PictureDrink +; back + + + 374 - 399 + 422 eval( If IsSmoRet = "true" Then Var return = "Enable" @@ -2108,21 +2862,22 @@ ; same - 0 - 752 - 1080 - Center - 68 + + 330 + 470 + 344 + 50 + Auto + 2 KanitMediumTTF 0x513C2F showname -; same + - 0 - 836 - 1080 - Center + 330 + CustomShowDescTextY + 344 24 KanitLightTTF 0x6F5F51 @@ -2131,7 +2886,167 @@ +; +; +; +; +; +; +; +; +; +; +;-BEGIN +; +;-BEGIN Lid straw + + 690 + 460 + 350 + 195 + Var( DirImage + "/topping_revamp/bg_strawlid.png" ) + + + +; straw left + + + + + + +; LID left + + + + + + LidDeactiveButton + 665 + 480 + Var( DirImage + "/text21.png" ) + + + + StrawDeactiveButton + 665 + 563 + Var( DirImage + "/text20.png" ) + + + + + +;-END +; +; + +; +; +; +; +; +; +; +; +; ; @@ -2150,7 +3065,7 @@ ; zone scroll 52 - 881 + 680 1080 880 880 @@ -2366,7 +3281,6 @@ ;-END - ; ; ; @@ -2374,1385 +3288,2327 @@ ; ; ; -; -; -;- Begin topping1 +; TEST - BEGIN Custom recipe - - 988 - 156 - 20 - BGSugar -; sugar layout - - BGSugar - Var( DirImage + "/bg_sugar.png" ) - - - -; - -; sugar1 - - -; sugar2 - - - -; sugar3 - - -; sugar4 - - -; sugar5 - -;- END topping1 - - - - - -; -; -; -; -; -; -; -; -; -; -;- Begin topping new - - - 988 - 156 - 20 - BGSugarNew -; sugar layout - "Enable" - Var( DirImage + "/bg_sugar_bank_button.png" ) - - - -; - -; sugar1 - - -; sugar2 - - - -; sugar3 - - -; sugar4 - - -; sugar5 - - -; sugar6 - -;- END topping1 - - - -; -; -; -; -; -; -; -; -; -; -; -; -; -; -;- Begin topping2 - - - 988 - 156 - 20 - BGSugarHotHealthy -; sugar layout - - BGSugarHotHealthy - Var( DirImage + "/bg_sugar_bank_button.png" ) - - - -; - -; sugar1 - - -; sugar2 - - - -; sugar3 - - -; sugar4 - - -;- END topping2 - - -; -; -; -; -; -; -; -; -; -; -; -; -; -; -;- Begin topping3 - - - 988 - 156 - 20 - BGSugarColdHealthy -; sugar layout - - BGSugarColdHealthy - Var( DirImage + "/bg_sugar_bank_button.png" ) - - - -; - -; sugar1 - - -; sugar2 - - - -; sugar3 - - -; sugar4 - - -;- END topping2 - - -; -; -; -; -; -; -; -; -; -; Extra topping. -; -; -; -; -; -; -;-BEGIN shot layout - - ExtraTopping 1080 "auto" 20 986 - "auto" + "auto" "vertical" - ExtraTopping + "Enable" + +; +; +; +; ; 986 64 - ExtraTopping + "Enable" - Var( DirImage + "/bg_top.png" ) + Var( DirImage + "/topping_revamp/bg_top_custom_recipe.png" ) - -; ; ; +;- Begin topping1 - 986 - "auto" - CerealMilkToppingEnable -; - - 0 - 0 - Var( DirImage + "/bg_top_milk.png") - + 986 + "auto" + BGSugar + + 0 + 0 + ExtraTopping + Var( DirImage + "/topping_revamp/bg_custom_sweet_level.png" ) + - + + ; sugar2 + + + ; sugar3 + + + ; sugar4 + + + ; sugar5 + + + ; sugar6 + + + + + CustomSweetNotTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[0] + 16 + 0x513C2F + CustomSweetrText[0] + + + CustomSweetNotPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[0] + 14 + 0x84776F + CustomSweetrPercent[0] + + + + CustomSweetLittleTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[1] + 16 + 0x513C2F + CustomSweetrText[1] + + + CustomSweetLittlePercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[1] + 14 + 0x84776F + CustomSweetrPercent[1] + + + + + CustomSweetLessTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[2] + 16 + 0x513C2F + CustomSweetrText[2] + + + CustomSweetLessPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[2] + 14 + 0x84776F + CustomSweetrPercent[2] + - If CerealMilkEnable = "Press" Then - Var CerealMilkEnable = "Enable" - Else - Var CerealMilkEnable = "Press" - EndIf - Function 2 + + CustomSweetPerfectTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[3] + 16 + 0x513C2F + CustomSweetrText[3] + + + + CustomSweetPerfectPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[3] + 14 + 0x84776F + CustomSweetrPercent[3] + + + + CustomSweetExtraTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[4] + 16 + 0x513C2F + CustomSweetrText[4] + + + + CustomSweetExtraPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[4] + 14 + 0x84776F + CustomSweetrPercent[4] + + + + + CustomSweetestTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[5] + 16 + 0x513C2F + CustomSweetrText[5] + + + + + CustomSweetestPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[5] + 14 + 0x84776F + CustomSweetrPercent[5] + + + + + + + + +;- Begin topping new + + 986 + "auto" + BGSugarNew + + 0 + 0 + BGSugarNew + Var( DirImage + "/topping_revamp/bg_custom_sweet_level.png" ) + + + + ; sugar1 + + + ; sugar2 + + + ; sugar3 + + + ; sugar4 + + + ; sugar5 + + + ; sugar6 + + + + + CustomSweetNotTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[0] + 16 + 0x513C2F + CustomSweetrText[0] + + + CustomSweetNotPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[0] + 14 + 0x84776F + CustomSweetrPercent[0] + + + + CustomSweetLittleTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[1] + 16 + 0x513C2F + CustomSweetrText[1] + + + CustomSweetLittlePercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[1] + 14 + 0x84776F + CustomSweetrPercent[1] + + + + + CustomSweetLessTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[2] + 16 + 0x513C2F + CustomSweetrText[2] + + + CustomSweetLessPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[2] + 14 + 0x84776F + CustomSweetrPercent[2] + + + + + + CustomSweetPerfectTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[3] + 16 + 0x513C2F + CustomSweetrText[3] + + + + CustomSweetPerfectPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[3] + 14 + 0x84776F + CustomSweetrPercent[3] + + + + CustomSweetExtraTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[4] + 16 + 0x513C2F + CustomSweetrText[4] + + + + CustomSweetExtraPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[4] + 14 + 0x84776F + CustomSweetrPercent[4] + + + + + CustomSweetestTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[5] + 16 + 0x513C2F + CustomSweetrText[5] + + + + + CustomSweetestPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[5] + 14 + 0x84776F + CustomSweetrPercent[5] + + - Refresh - - -; - - - - CerealMilkX - 2 - KanitRegularTTF - CerealMilkEnable - 36 - 0x84776F - CerealMilkPrice - - -; -; -; -; -; -; -; -; -; -; -; -; -; -; -; -; -; -; -; -; -; - 986 - "auto" - ShotCoffeePremium -; - - 0 - 0 - Var( DirImage + "/bg_top_b3shot.png") - + 986 + "auto" + BGSugarHotHealthy + + 0 + 0 + BGSugarHotHealthy + Var( DirImage + "/topping_revamp/bg_custom_sweet_level.png" ) + - + + ; sugar2 + + + ; sugar3 + + + ; sugar4 + + + ; sugar5 + + + ; sugar6 + + + + + CustomSweetNotTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[0] + 16 + 0x513C2F + CustomSweetrText[0] + + + CustomSweetNotPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[0] + 14 + 0x84776F + CustomSweetrPercent[0] + + + + CustomSweetLittleTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[1] + 16 + 0x513C2F + CustomSweetrText[1] + + + CustomSweetLittlePercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[1] + 14 + 0x84776F + CustomSweetrPercent[1] + + + + + CustomSweetLessTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[2] + 16 + 0x513C2F + CustomSweetrText[2] + + + CustomSweetLessPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[2] + 14 + 0x84776F + CustomSweetrPercent[2] + - If ShotCoffeePremium = "Press" Then - Var ShotCoffeePremium = "Enable" - Else - Var ShotCoffeePremium = "Press" - EndIf - Function 2 + + CustomSweetPerfectTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[3] + 16 + 0x513C2F + CustomSweetrText[3] + + + + CustomSweetPerfectPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[3] + 14 + 0x84776F + CustomSweetrPercent[3] + + + + CustomSweetExtraTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[4] + 16 + 0x513C2F + CustomSweetrText[4] + + + + CustomSweetExtraPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[4] + 14 + 0x84776F + CustomSweetrPercent[4] + + + + + CustomSweetestTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[5] + 16 + 0x513C2F + CustomSweetrText[5] + + + + + CustomSweetestPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[5] + 14 + 0x84776F + CustomSweetrPercent[5] + + - Refresh - - -; - + ; sugar1 + + + ; sugar2 + + + ; sugar3 + + + ; sugar4 + + + ; sugar5 + + + ; sugar6 + + + + + CustomSweetNotTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[0] + 16 + 0x513C2F + CustomSweetrText[0] + + + CustomSweetNotPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[0] + 14 + 0x84776F + CustomSweetrPercent[0] + + + + CustomSweetLittleTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[1] + 16 + 0x513C2F + CustomSweetrText[1] + + + CustomSweetLittlePercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[1] + 14 + 0x84776F + CustomSweetrPercent[1] + + + + + CustomSweetLessTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[2] + 16 + 0x513C2F + CustomSweetrText[2] + + + CustomSweetLessPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[2] + 14 + 0x84776F + CustomSweetrPercent[2] + + + + + + CustomSweetPerfectTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[3] + 16 + 0x513C2F + CustomSweetrText[3] + + + + CustomSweetPerfectPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[3] + 14 + 0x84776F + CustomSweetrPercent[3] + + + + CustomSweetExtraTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[4] + 16 + 0x513C2F + CustomSweetrText[4] + + + + CustomSweetExtraPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[4] + 14 + 0x84776F + CustomSweetrPercent[4] + + + + + CustomSweetestTextX + CustomSweetTextY + KanitRegularTTF + CustomSweetState[5] + 16 + 0x513C2F + CustomSweetrText[5] + + + + + CustomSweetestPercentTextX + CustomSweetPercentTextY + KanitRegularTTF + CustomSweetState[5] + 14 + 0x84776F + CustomSweetrPercent[5] + + + + + -; -; -; -;-BEGIN shot layout "showShotEnable" - - 986 - "auto" - showShotEnable -; - - 0 - 0 - Var( DirImage + "/bg_top_shot2.png") - -; - + Var CustomEnaergyState[0] = "Enable" + Var CustomEnaergyState[1] = "Enable" + + Else + Var CustomEspressoState[0] = "Press" + + Var CustomEnaergyState[0] = "Disable" + Var CustomEnaergyState[1] = "Disable" + EndIf + -; - - - - - "OnValueChange" - - + + + + + + 784 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x513C2F + CustomEspressoText[1] + + + + 892 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x513C2F + CustomEspressoText[2] + + + ; Additional Price + + 830 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x84776F + CoffeeTextLevel1 + + + + 940 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x84776F + CoffeeTextLevel2 + + + + + + + 986 + "auto" + showShotEnable + + 0 + 0 + Var( DirImage + "/topping_revamp/bg_custom_energy_level.png" ) + + + + + + + + + + + 784 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x513C2F + CustomEspressoText[0] + + + + 892 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x513C2F + CustomEspressoText[1] + + + ; Additional Price + + 830 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x84776F + EnergyTextLevel1 + + + + 940 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x84776F + EnergyTextLevel2 + + + + + + 986 + "auto" + "Invisible" + + 0 + 0 + Var( DirImage + "/topping_revamp/bg_custom_cocoa_level.png" ) + + + + + + + + + + 684 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x513C2F + CustomCocoaText[0] + + + + 794 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x513C2F + CustomCocoaText[1] + + + + 903 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x513C2F + CustomCocoaText[2] + -; -; -; -; -; - - 986 - "auto" - showOreoAddEnable -; - - 0 - 0 - Var( DirImage + "/bg_top_oreo2.png") - -; - - -; - - - - showText8 - 600 - 6 - Var( DirImage + "/text8.png" ) - + Function 2 - - text_x_add_oreo_price - 12 - KanitRegularTTF - "Enable" - 36 - 0x84776F - text_price_6 - + + + + + + + + + 674 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x513C2F + CustomOvaltineText[0] + + + + 784 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x513C2F + CustomOvaltineText[1] + + + + 893 + CustomEspressoTextY + KanitRegularTTF + showEspressoLevel + 16 + 0x513C2F + CustomOvaltineText[2] + -; -; -; -; -; -; + + 986 + "auto" + BGSugarNew + + 0 + 0 + Var( DirImage + "/topping_revamp/bg_custom_milk.png" ) + + + + + + + + + 694 + CustomEspressoTextY + KanitRegularTTF + CustomMilkState[0] + 16 + 0x513C2F + CustomMilkText[0] + + + + 804 + CustomEspressoTextY + KanitRegularTTF + CustomMilkState[1] + 16 + 0x513C2F + CustomMilkText[1] + + + + 893 + CustomEspressoTextY + KanitRegularTTF + CustomMilkState[2] + 16 + 0x513C2F + CustomMilkText[2] + + + ; Additional Price + + 935 + CustomEspressoTextY + KanitRegularTTF + CustomMilkState[2] + 16 + 0x84776F + MilkIncreasePriceText + + + + + + + + + + +; +; +; "Enable" 986 27 -5 - ExtraTopping + "Enable" "ROOT/taobin_project/image/topping2/bg_bottom.png" - - -; -; -; -; -; -; -; + + + + + ; ; @@ -3784,8 +5640,18 @@ 64 showCustomCoffee - Var( DirImage + "/bg_top_custom_coffee.png" ) + "ROOT/taobin_project/image/topping_mmr/bg_top_custom_coffee.png" + + + 40 + 10 + 500 + 72 + + 000103 + + ; ; @@ -4446,6 +6312,12 @@ + + + + + + ; ; ; @@ -4454,148 +6326,594 @@ ; ; ; +; Extra topping. ; -; -;-BEGIN -; -;-BEGIN Lid straw - - 986 - 240 +; +; +; +; +; +;-BEGIN shot layout + + SpecialMix + 1080 + "auto" 20 - ShowLidStraw + + + 986 + "auto" + "vertical" + SpecialMix +; + + 986 + 72 + SpecialMix + + Var( DirImage + "/topping_revamp/bg_top_special_mix.png" ) + + + +; +; +; + + 986 + "auto" + showOvaltineEnable +; - bg_strawlid + 0 + 0 + Var( DirImage + "/topping_revamp/bg_special_ovaltine.png") -; straw left +; + + 833 + 26 + KanitRegularTTF + showOvaltineEnable + 16 + 0x84776F + OvaltinePriceText + + + +; +; +; +; +; +; +; +; +; +; +; +; +; +; +; +; +; +; +; +; +; -; LID left +; +; +; +; +; + + 986 + "auto" + showOreoAddEnable +; + + 0 + 0 + Var( DirImage + "/topping_revamp/bg_special_oreo.png") + +; +; + + + 833 + 26 + KanitRegularTTF + showOreoAddEnable + 16 + 0x84776F + OreoPriceText + + + + + +; +; +; +; +; + + 986 + "auto" + showCocoaEnable +; - StrawDeactiveButton - 602 - 64 - Var( DirImage + "/text20.png" ) + 0 + 0 + Var( DirImage + "/topping_revamp/bg_special_cocoa.png") +; + + + + 833 + 26 + KanitRegularTTF + showCocoaEnable + 16 + 0x84776F + CocoaPriceText + + +; + + + + + + + +; +; +; +; +; + + 986 + "auto" + CollagenState +; - LidDeactiveButton - 602 - 150 - Var( DirImage + "/text21.png" ) + 0 + 0 + Var( DirImage + "/topping_revamp/bg_top_jemila_free.png") +; + + +; + + + + + 833 + 26 + KanitRegularTTF + CollagenState + 16 + 0x92D955 + CollagenPriceText + + + + + +; +; +; +; +; +; + + + "Enable" + 986 + 27 + -5 + + ExtraTopping + "ROOT/taobin_project/image/topping2/bg_bottom.png" + + + + + + -;-END -; -; ; ; @@ -4605,7 +6923,268 @@ ; ; ; +; Custom Syrup ; +; +; +; +; +; + + CustomSyrup + 1080 + "auto" + 20 + + + 986 + "auto" + "vertical" + CustomSyrup +; + + 986 + 72 + CustomSyrup + + Var( DirImage + "/topping_revamp/bg_top_custom_syrup.png" ) + + + +; +; +; +; +; + + 986 + "auto" + showStrawberryEnable +; + + 0 + 0 + Var( DirImage + "/topping_revamp/bg_syrup_straberry.png") + + + + +; + + + + 833 + 26 + KanitRegularTTF + "Enable" + 16 + 0x84776F + StrawberryPriceText + + + +; +; +; +; +; +; +; +; +; + + 986 + "auto" + showYuzuEnable +; + + 0 + 0 + Var( DirImage + "/topping_revamp/bg_syrup_yuzu.png") + +; + + +; + + + + 833 + 26 + KanitRegularTTF + "Enable" + 16 + 0x84776F + YuzuPriceText + + + + + +; +; +; +; +; +; + + + "Enable" + 986 + 27 + -5 + + ExtraTopping + "ROOT/taobin_project/image/topping2/bg_bottom.png" + + + + + + + +; +; +; +; +; +; +; + + @@ -4977,289 +7556,369 @@ ;Var Seeker = "curr" + Var Timeout = 0 - - Var StatementCheckMenu = "ProductCodeCheck=" + UserSelectProductCode - - __CMD "statement" 0 StatementCheckMenu "-" - - - DEBUGVAR PriceDrinkTmp - - ;Var Seeker.PriceDrink = PriceDrinkTmp - - Var PriceDrink = PriceDrinkTmp - - SAVELOG "USER press next ( topping ) - new" - - If SugarState1 = "PressForever" Then - If ShiftSugarStep = 1 Then - Var topping1 = toppingID1index1 - EndIf + If showOvaltineEnable = "Press" Then + ;Var CustomOvaltineCheckState = "Press" + Var SelectToppingType = 1 EndIf - If SugarState2 = "PressForever" Then - If ShiftSugarStep = 1 Then - Var topping1 = toppingID1index2 - EndIf - If ShiftSugarStep = 2 Then - Var topping1 = toppingID1index1 - EndIf - + If showOreoAddEnable = "Press" Then + ;Var CustomOreoCheckState = "Press" + Var SelectToppingType = 1 EndIf - If SugarState3 = "PressForever" Then - If ShiftSugarStep = 1 Then - Var topping1 = toppingID1index3 - EndIf - If ShiftSugarStep = 2 Then - Var topping1 = toppingID1index2 - EndIf - If ShiftSugarStep = 3 Then - Var topping1 = toppingID1index1 - EndIf - + If showCocoaEnable = "Press" Then + ;Var CustomCocoaCheckState = "Press" + Var SelectToppingType = 1 EndIf - If SugarState3 = "PressForever" Then - If ShiftSugarStep = 1 Then - Var topping1 = toppingID1index3 - EndIf - If ShiftSugarStep = 2 Then - Var topping1 = toppingID1index2 - EndIf - If ShiftSugarStep = 3 Then - Var topping1 = toppingID1index1 + + + + + Var StatementCheckMenu = "ProductCodeCheck=" + UserSelectProductCode + + __CMD "statement" 0 StatementCheckMenu "-" + + + DEBUGVAR PriceDrinkTmp + + ;Var Seeker.PriceDrink = PriceDrinkTmp + + Var PriceDrink = PriceDrinkTmp + + SAVELOG "USER press next ( topping ) - newwwwww" + + If CustomSweetState[0] = "PressForever" Then + If ShiftSugarStep = 1 Then + Var topping1 = toppingID1index1 + EndIf EndIf - EndIf + If CustomSweetState[1] = "PressForever" Then + If ShiftSugarStep = 1 Then + Var topping1 = toppingID1index2 + EndIf + If ShiftSugarStep = 2 Then + Var topping1 = toppingID1index1 + EndIf - If SugarState4 = "PressForever" Then - If ShiftSugarStep = 1 Then - Var topping1 = toppingID1index4 - EndIf - If ShiftSugarStep = 2 Then - Var topping1 = toppingID1index3 - EndIf - If ShiftSugarStep = 3 Then - Var topping1 = toppingID1index2 EndIf - EndIf + If CustomSweetState[2] = "PressForever" Then + If ShiftSugarStep = 1 Then + Var topping1 = toppingID1index3 + EndIf + If ShiftSugarStep = 2 Then + Var topping1 = toppingID1index2 + EndIf + If ShiftSugarStep = 3 Then + Var topping1 = toppingID1index1 + EndIf - If SugarState5 = "PressForever" Then - If ShiftSugarStep = 1 Then - Var topping1 = toppingID1index5 - EndIf - If ShiftSugarStep = 2 Then - Var topping1 = toppingID1index4 - EndIf - If ShiftSugarStep = 3 Then - Var topping1 = toppingID1index3 EndIf - EndIf + If CustomSweetState[2] = "PressForever" Then + If ShiftSugarStep = 1 Then + Var topping1 = toppingID1index3 + EndIf + If ShiftSugarStep = 2 Then + Var topping1 = toppingID1index2 + EndIf + If ShiftSugarStep = 3 Then + Var topping1 = toppingID1index1 + EndIf - If showCustomCoffee = "Enable" Then - If showCoffeeWater = "Enable" Then - If CustomCoffeeWaterState[0] = "PressForever" Then - Var topping7 = toppingID7index1 - EndIf - If CustomCoffeeWaterState[1] = "PressForever" Then - Var topping7 = toppingID7index2 - EndIf - If CustomCoffeeWaterState[2] = "PressForever" Then - Var topping7 = toppingID7index3 - EndIf - If CustomCoffeeWaterState[3] = "PressForever" Then - Var topping7 = toppingID7index4 - EndIf - If CustomCoffeeWaterState[4] = "PressForever" Then - Var topping7 = toppingID7index5 - EndIf - Else - Var topping7 = 0 EndIf - - If showCoffeeQuantity = "Enable" Then - If CustomCoffeeQuantityState[0] = "PressForever" Then - Var topping2 = toppingID2index1 + + If CustomMilkState[0] = "PressForever" Then + Var topping11 = toppingID11index1 + EndIf + If CustomMilkState[1] = "PressForever" Then + Var topping11 = toppingID11index2 + EndIf + If CustomMilkState[2] = "PressForever" Then + Var topping11 = toppingID11index3 + EndIf + + + If CustomSweetState[3] = "PressForever" Then + If ShiftSugarStep = 1 Then + Var topping1 = toppingID1index4 EndIf - If CustomCoffeeQuantityState[1] = "PressForever" Then - Var topping2 = toppingID2index2 + If ShiftSugarStep = 2 Then + Var topping1 = toppingID1index3 EndIf - If CustomCoffeeQuantityState[2] = "PressForever" Then - Var topping2 = toppingID2index3 + If ShiftSugarStep = 3 Then + Var topping1 = toppingID1index2 + EndIf + + EndIf + + If CustomSweetState[4] = "PressForever" Then + If ShiftSugarStep = 1 Then + Var topping1 = toppingID1index5 + EndIf + If ShiftSugarStep = 2 Then + Var topping1 = toppingID1index4 + EndIf + If ShiftSugarStep = 3 Then + Var topping1 = toppingID1index3 + EndIf + + EndIf + + If showCustomCoffee = "Enable" Then + If showCoffeeWater = "Enable" Then + If CustomCoffeeWaterState[0] = "PressForever" Then + Var topping7 = toppingID7index1 + EndIf + If CustomCoffeeWaterState[1] = "PressForever" Then + Var topping7 = toppingID7index2 + EndIf + If CustomCoffeeWaterState[2] = "PressForever" Then + Var topping7 = toppingID7index3 + EndIf + If CustomCoffeeWaterState[3] = "PressForever" Then + Var topping7 = toppingID7index4 + EndIf + If CustomCoffeeWaterState[4] = "PressForever" Then + Var topping7 = toppingID7index5 + EndIf + Else + Var topping7 = 0 + EndIf + + If showCoffeeQuantity = "Enable" Then + If CustomCoffeeQuantityState[0] = "PressForever" Then + Var topping2 = toppingID2index1 + EndIf + If CustomCoffeeQuantityState[1] = "PressForever" Then + Var topping2 = toppingID2index2 + EndIf + If CustomCoffeeQuantityState[2] = "PressForever" Then + Var topping2 = toppingID2index3 + EndIf + Else + If toppingID2index3 = "" Then + Else + Var topping2 = 0 + EndIf + EndIf + + If showCoffeeLevel = "Enable" Then + If CustomCoffeeLevelState[0] = "PressForever" Then + Var topping9 = toppingID9index1 + EndIf + If CustomCoffeeLevelState[1] = "PressForever" Then + Var topping9 = toppingID9index2 + EndIf + If CustomCoffeeLevelState[2] = "PressForever" Then + Var topping9 = toppingID9index3 + EndIf + If CustomCoffeeLevelState[3] = "PressForever" Then + Var topping9 = toppingID9index4 + EndIf + Else + Var topping9 = 0 + EndIf + + If showCoffeeTamping = "Enable" Then + If CustomCoffeeTampingState[0] = "PressForever" Then + Var topping8 = toppingID8index1 + EndIf + If CustomCoffeeTampingState[1] = "PressForever" Then + Var topping8 = toppingID8index2 + EndIf + If CustomCoffeeTampingState[2] = "PressForever" Then + Var topping8 = toppingID8index3 + EndIf + Else + Var topping8 = 0 EndIf Else If toppingID2index3 = "" Then Else Var topping2 = 0 EndIf - EndIf - - If showCoffeeLevel = "Enable" Then - If CustomCoffeeLevelState[0] = "PressForever" Then - Var topping9 = toppingID9index1 - EndIf - If CustomCoffeeLevelState[1] = "PressForever" Then - Var topping9 = toppingID9index2 - EndIf - If CustomCoffeeLevelState[2] = "PressForever" Then - Var topping9 = toppingID9index3 - EndIf - If CustomCoffeeLevelState[3] = "PressForever" Then - Var topping9 = toppingID9index4 - EndIf - Else - Var topping9 = 0 - EndIf - - If showCoffeeTamping = "Enable" Then - If CustomCoffeeTampingState[0] = "PressForever" Then - Var topping8 = toppingID8index1 - EndIf - If CustomCoffeeTampingState[1] = "PressForever" Then - Var topping8 = toppingID8index2 - EndIf - If CustomCoffeeTampingState[2] = "PressForever" Then - Var topping8 = toppingID8index3 - EndIf - Else + Var topping7 = 0 Var topping8 = 0 + Var topping9 = 0 + Var topping10 = 0 EndIf - Else - If toppingID2index3 = "" Then + + + Var Seeker.topping1 = topping1 + Var Seeker.topping2 = topping2 + Var Seeker.topping3 = topping3 + Var Seeker.topping6 = topping6 + Var Seeker.topping7 = topping7 + Var Seeker.topping8 = topping8 + Var Seeker.topping9 = topping9 + Var Seeker.topping10 = topping10 + Var Seeker.topping11 = topping11 + + Var Seeker.get_a_straw = StrawState + Var Seeker.get_a_lid = LidState + + + DEBUGVAR Seeker.topping1 + DEBUGVAR Seeker.topping2 + DEBUGVAR Seeker.topping3 + DEBUGVAR Seeker.topping6 + DEBUGVAR Seeker.topping7 + DEBUGVAR Seeker.topping8 + DEBUGVAR Seeker.topping9 + DEBUGVAR Seeker.topping10 + DEBUGVAR Seeker.topping11 + DEBUGVAR Seeker.get_a_straw + DEBUGVAR Seeker.get_a_lid + + DEBUGVAR LidState + DEBUGVAR StrawState + DEBUGVAR UserSelectProductCode + + + If StrawState = "Press" Then + Machine StrawOrder + Var LedLidBlink = "true" + EndIf + + If LidState = "Press" Then + Machine LidOrder + Var LedLidBlink = "true" + Var bg_lidProblem_ST = "Enable" Else - Var topping2 = 0 - EndIf - Var topping7 = 0 - Var topping8 = 0 - Var topping9 = 0 - Var topping10 = 0 - EndIf - - - Var Seeker.topping1 = topping1 - Var Seeker.topping2 = topping2 - Var Seeker.topping3 = topping3 - Var Seeker.topping6 = topping6 - Var Seeker.topping7 = topping7 - Var Seeker.topping8 = topping8 - Var Seeker.topping9 = topping9 - Var Seeker.topping10 = topping10 - - Var Seeker.get_a_straw = StrawState - Var Seeker.get_a_lid = LidState - - - DEBUGVAR Seeker.topping1 - DEBUGVAR Seeker.topping2 - DEBUGVAR Seeker.topping3 - DEBUGVAR Seeker.topping6 - DEBUGVAR Seeker.topping7 - DEBUGVAR Seeker.topping8 - DEBUGVAR Seeker.topping9 - DEBUGVAR Seeker.topping10 - DEBUGVAR Seeker.get_a_straw - DEBUGVAR Seeker.get_a_lid - - DEBUGVAR LidState - DEBUGVAR StrawState - DEBUGVAR UserSelectProductCode - - - If StrawState = "Press" Then - Machine StrawOrder - Var LedLidBlink = "true" - EndIf - - If LidState = "Press" Then - Machine LidOrder - Var LedLidBlink = "true" - Var bg_lidProblem_ST = "Enable" - Else - If LidState = "Disable" Then - Var bg_lidProblem_ST = "Disable" - Else - Var bg_lidProblem_ST = "Invisible" - EndIf - EndIf - - If SelectDrinkType = 0 Then + If LidState = "Disable" Then + Var bg_lidProblem_ST = "Disable" + Else + Var bg_lidProblem_ST = "Invisible" + EndIf + EndIf + + If SelectDrinkType = 0 Then + + Else + Var StrawState = "Enable" + Var LidState = "Enable" + EndIf + ; - Else - Var StrawState = "Enable" - Var LidState = "Enable" - EndIf - ; - - DEBUGVAR PromotionIDCurrentOrder - - - Var SelectDrink = UserSelectProductCode - - Var Seeker.selected_a_drink = UserSelectProductCode - DEBUGVAR Seeker.selected_a_drink + DEBUGVAR PromotionIDCurrentOrder + + + Var SelectDrink = UserSelectProductCode + + Var Seeker.selected_a_drink = UserSelectProductCode + DEBUGVAR Seeker.selected_a_drink - ; Set drink + ; Set drink - If Seeker = "curr" Then - Topping "Select" UserSelectProductCode + If Seeker = "curr" Then + If SelectToppingType = 0 Then - ; Set option toppinng and pack - Topping "Select1-ID" topping1 - Topping "Select2-ID" topping2 - Topping "Select3-ID" topping3 - Topping "Select6-ID" topping6 - Topping "Select7-ID" topping7 - Topping "Select8-ID" topping8 - Topping "Select9-ID" topping9 - Topping "Select10-ID" topping10 + If blend_button_state = "PressForever" Then + + Else + Topping "Select" UserSelectProductCode - ; Pack - Topping "Pack" ExtendDataCurr + ; Set option toppinng and pack + Topping "Select1-ID" topping1 + Topping "Select2-ID" topping2 + Topping "Select3-ID" topping3 + Topping "Select6-ID" topping6 + Topping "Select7-ID" topping7 + Topping "Select8-ID" topping8 + Topping "Select9-ID" topping9 + Topping "Select10-ID" topping10 + Topping "Select11-ID" topping11 - Else - Topping "SetNextOrder" UserSelectProductCode + ; Pack + Topping "Pack" ExtendDataCurr + EndIf + Else + Topping "Select" UserSelectProductCode + + ; Set option toppinng and pack + Topping "Select1-ID" topping1 + Topping "Select2-ID" topping2 + Topping "Select3-ID" topping3 + Topping "Select6-ID" topping6 + Topping "Select7-ID" topping7 + Topping "Select8-ID" topping8 + Topping "Select9-ID" topping9 + Topping "Select10-ID" topping10 + Topping "Select11-ID" topping11 + + + ; Pack + Topping "Pack" ExtendDataCurr + EndIf + + Else + Topping "SetNextOrder" UserSelectProductCode - Topping "__select" UserSelectProductCode - ; Set option toppinng and pack - Topping "__select1-id" topping1 - Topping "__select2-id" topping2 - Topping "__select3-id" topping3 - Topping "__select6-id" topping6 - Topping "__select7-id" topping7 - Topping "__select8-id" topping8 - Topping "__select9-id" topping9 - Topping "__select10-id" topping10 - ; Pack - Topping "__pack" ExtendDataNext + Topping "__select" UserSelectProductCode + ; Set option toppinng and pack + Topping "__select1-id" topping1 + Topping "__select2-id" topping2 + Topping "__select3-id" topping3 + Topping "__select6-id" topping6 + Topping "__select7-id" topping7 + Topping "__select8-id" topping8 + Topping "__select9-id" topping9 + Topping "__select10-id" topping10 + Topping "__select11-id" topping11 - Var NextUserSelectDrinkFromPaid = UserSelectProductCode - Var NextUserSelecttopping1Paid = topping1 - Var NextUserSelecttopping2Paid = topping2 - Var NextUserSelecttopping3Paid = topping3 - Var NextUserSelecttopping6Paid = topping6 - Var NextUserSelecttopping7Paid = topping7 - Var NextUserSelecttopping8Paid = topping8 - Var NextUserSelecttopping9Paid = topping9 - Var NextUserSelecttopping10Paid = topping10 + + ; Pack + Topping "__pack" ExtendDataNext + + Var NextUserSelectDrinkFromPaid = UserSelectProductCode + Var NextUserSelecttopping1Paid = topping1 + Var NextUserSelecttopping2Paid = topping2 + Var NextUserSelecttopping3Paid = topping3 + Var NextUserSelecttopping6Paid = topping6 + Var NextUserSelecttopping7Paid = topping7 + Var NextUserSelecttopping8Paid = topping8 + Var NextUserSelecttopping9Paid = topping9 + Var NextUserSelecttopping10Paid = topping10 + Var NextUserSelecttopping11Paid = topping11 - EndIf - DEBUGVAR Seeker - DEBUGVAR Seeker.ExtendData + EndIf - Var Seeker.PictureDrink = PictureDrink - Var Seeker.showname = showname + If Seeker = "curr" Then + If SelectToppingType = 0 Then + + Else + Topping "Select" UserSelectProductCode - DEBUGVAR MenuCautionImageStage0 - DEBUGVAR CustomerFilterEnable - DEBUGVAR CustomerFilterType + Topping "ClearMultiTopping" "Test 4" + + Topping "Multiply6-ID" strMulti6_1 + Topping "Multiply6-ID" strMulti6_2 + Topping "Multiply6-ID" strMulti6_3 + Topping "Multiply6-ID" strMulti6_5 + Topping "Multiply6-ID" strMulti6_6 + + Topping "Pack" ExtendDataCurr + EndIf + EndIf + + DEBUGVAR Seeker + DEBUGVAR Seeker.ExtendData + + Var Seeker.PictureDrink = PictureDrink + Var Seeker.showname = showname + + DEBUGVAR MenuCautionImageStage0 + DEBUGVAR CustomerFilterEnable + DEBUGVAR CustomerFilterType GetLongTimeInMinute LastTimeClickOrder @@ -5279,7 +7938,26 @@ If SelectDrinkType = 0 Then Var high_light_drink_type = "Enable" + Else + If SelectToppingType = 0 Then + If blend_button_state = "PressForever" Then + Var toppingSelectState = "Enable" + If toppingSelectState = "Enable" Then + Var CustomOreoState = "Enable" + Var CustomOvaltineState = "Enable" + Var CustomCocoaState = "Enable" + + Var PopupToppingSelect = "Enable" + + + Var CustomOreoCheckState = "Enable" + Var CustomOvaltineCheckState = "Enable" + Var CustomCocoaCheckState = "Enable" + EndIf + EndIf + EndIf EndIf + Else If CART1_STATUS = "EMPTY" Then @@ -5299,10 +7977,14 @@ EndIf + + Var LastTimeClickOrder = 0 + + @@ -5311,7 +7993,8 @@ - + Var fun = "function2" + DEBUGVAR fun Var img_cold_no_flag = 0 Var img_smth_no_flag = 0 @@ -5503,6 +8186,35 @@ Machine PreparCup EndIf + + Var OreoPrice = 10 + Var CocoaPrice = 10 + Var OvaltinePrice = 10 + Var StrawberryPrice = 5 + Var YuzuPrice = 5 + Var MilkIncreasePrice = 5 + + Var EnergyPriceLevel1 = 5 + Var EnergyPriceLevel2 = 10 + + Var CoffeePriceLevel1 = 15 + Var CoffeePriceLevel2 = 25 + + Var OreoPriceText = "(+10)" + Var CocoaPriceText = "(+10)" + Var OvaltinePriceText = "(+10)" + Var StrawberryPriceText = "(+5)" + Var YuzuPriceText = "(+5)" + Var MilkIncreasePriceText = "(+5)" + Var CollagenPriceText = "(Free)" + + Var EnergyTextLevel1 = "(+5)" + Var EnergyTextLevel2 = "(+10)" + + Var CoffeeTextLevel1 = "(+15)" + Var CoffeeTextLevel2 = "(+25)" + + Var CerealMilkAddAmount = SubMenuPrice1 - PriceDrinkNoTop @@ -5586,20 +8298,98 @@ DEBUGVAR showOreoAddEnable DEBUGVAR TOPPING_PRICE + ; Oreo + Var strMulti6_1 = "TPID:321+multiply:0" + ; Ovaltine + Var strMulti6_2 = "TPID:323+multiply:0" + ; Coaco + Var strMulti6_3 = "TPID:322+multiply:0" + + If showOreoAddEnable = "Press" Then - Var TOPPING_PRICE = TOPPING_PRICE + toppingID6price2 - Var topping6 = toppingID6index2 + Var TOPPING_PRICE = TOPPING_PRICE + OreoPrice + ;Var topping6 = toppingID6index2 + Var strMulti6_1 = "TPID=321,multiply=1" Var DisableUsingCode = "true" + DEBUGVAR DisableUsingCode Else ;Var PriceDrinkTmp = PriceDrinkNoTop - Var topping6 = toppingID6index1 + Var strMulti6_1 = "TPID=320,multiply=0" Var DisableUsingCode = "false" + DEBUGVAR DisableUsingCode EndIf + + If showOvaltineEnable = "Press" Then + Var TOPPING_PRICE = TOPPING_PRICE + OvaltinePrice + ;Var topping6 = toppingID6index5 + Var strMulti6_2 = "TPID=323,multiply=1" + Var DisableUsingCode = "true" + DEBUGVAR DisableUsingCode + Else + ;Var PriceDrinkTmp = PriceDrinkNoTop + + Var strMulti6_2 = "TPID=320,multiply=0" + + Var DisableUsingCode = "false" + DEBUGVAR DisableUsingCode + + EndIf + + If showCocoaEnable = "Press" Then + Var TOPPING_PRICE = TOPPING_PRICE + CocoaPrice + ;Var topping6 = toppingID6index3 + Var strMulti6_3 = "TPID=322,multiply=1" + Var DisableUsingCode = "true" + DEBUGVAR DisableUsingCode + Else + + ;Var PriceDrinkTmp = PriceDrinkNoTop + + Var strMulti6_3 = "TPID=320,multiply=0" + + Var DisableUsingCode = "false" + DEBUGVAR DisableUsingCode + + EndIf + + If CustomMilkState[2] = "PressForever" Then + Var TOPPING_PRICE = TOPPING_PRICE + MilkIncreasePrice + EndIf + + + If CustomEnaergyState[0] = "Press" Then + Var TOPPING_PRICE = TOPPING_PRICE + EnergyPriceLevel1 + EndIf + + If CustomEnaergyState[1] = "Press" Then + Var TOPPING_PRICE = TOPPING_PRICE + EnergyPriceLevel2 + EndIf + + If CustomEspressoState[0] = "Press" Then + Var TOPPING_PRICE = TOPPING_PRICE + CoffeePriceLevel1 + EndIf + + If CustomEspressoState[1] = "Press" Then + Var TOPPING_PRICE = TOPPING_PRICE + CoffeePriceLevel2 + EndIf + + + If CollagenState = "Press" Then + Var TOPPING_PRICE = TOPPING_PRICE + CollagenToppingPrice + Var topping3 = toppingID3index2 + Var Seeker.UseFreeCollagenTopping = 1 + Else + Var topping3 = toppingID3index1 + Var Seeker.UseFreeCollagenTopping = 0 + EndIf + + + If CerealMilkEnable = "Press" Then If MenuCodeName1 = "Cereal-Milk" Then Var TOPPING_PRICE = TOPPING_PRICE + CerealMilkAddAmount @@ -5610,6 +8400,37 @@ Else EndIf + + If showStrawberryEnable = "Press" Then + Var TOPPING_PRICE = TOPPING_PRICE + StrawberryPrice + Var strMulti6_5 = "TPID=324,multiply=1" + Var DisableUsingCode = "true" + Else + + + Var strMulti6_5 = "TPID=320,multiply=0" + + Var DisableUsingCode = "false" + DEBUGVAR DisableUsingCode + + EndIf + + + If showYuzuEnable = "Press" Then + Var TOPPING_PRICE = TOPPING_PRICE + YuzuPrice + Var strMulti6_6 = "TPID=325,multiply=1" + Var DisableUsingCode = "true" + Else + + + Var strMulti6_6 = "TPID=320,multiply=0" + + Var DisableUsingCode = "false" + DEBUGVAR DisableUsingCode + + EndIf + + Var CustomCoffeeDefault = "true" DEBUGVAR showCustomCoffee DEBUGVAR CustomCoffeeDefault @@ -5748,6 +8569,48 @@ DEBUGVAR showname DEBUGVAR showdesc + Var hasPress = "false" + + If CustomOreoState = "Enable" Then + If CustomOreoCheckState = "Press" Then + Var hasPress = "true" + EndIf + EndIf + + If CustomOvaltineState = "Enable" Then + If CustomOvaltineCheckState = "Press" Then + Var hasPress = "true" + EndIf + EndIf + + If CustomCocoaState = "Enable" Then + If CustomCocoaCheckState = "Press" Then + Var hasPress = "true" + EndIf + EndIf + + If hasPress = "true" Then + Var PopupToppingSelect = "Press" + If show_eng = "true" Then + Var bnAccept = "ROOT/taobin_project/image/topping2_en/topping_revamp/bn_accept.png" + Var bpAccept = "ROOT/taobin_project/image/topping2_en/topping_revamp/bp_accept.png" + Else + Var bnAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bn_accept.png" + Var bpAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bp_accept.png" + EndIf + Var bnAcceptX = 445 + Else + Var PopupToppingSelect = "Enable" + If show_eng = "true" Then + Var bnAccept = "ROOT/taobin_project/image/topping2_en/topping_revamp/bn_accept2.png" + Var bpAccept = "ROOT/taobin_project/image/topping2_en/topping_revamp/bp_accept2.png" + Else + Var bnAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bn_accept2.png" + Var bpAccept = "ROOT/taobin_project/image/topping2/topping_revamp/bp_accept2.png" + EndIf + Var bnAcceptX = 360 + EndIf + Var Timeout = 0 @@ -5818,7 +8681,7 @@ FreePowerup Var( DirImage + "/bn_powerupFree.png" ) Var( DirImage + "/bp_powerupFree.png" ) - "/mnt/sdcard/coffeevending/wav/click.wav" + "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -6097,6 +8960,18 @@ EndIf + + Topping "ClearMultiTopping" "Test 4" + + + Topping "Multiply6-ID" strMulti6_1 + Topping "Multiply6-ID" strMulti6_2 + Topping "Multiply6-ID" strMulti6_3 + Topping "Multiply6-ID" strMulti6_5 + Topping "Multiply6-ID" strMulti6_6 + + Topping "Pack" ExtendDataCurr + DEBUGVAR Seeker DEBUGVAR Seeker.ExtendData @@ -6116,6 +8991,7 @@ Else + If SelectDrinkType = 1 Then ; Move to MenuReady ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" @@ -6125,7 +9001,23 @@ If SelectDrinkType = 0 Then Var high_light_drink_type = "Enable" + Else + If SelectToppingType = 0 Then + Var toppingSelectState = "Enable" + If toppingSelectState = "Enable" Then + Var CustomOreoState = "Enable" + Var CustomOvaltineState = "Enable" + Var CustomCocoaState = "Enable" + + Var PopupToppingSelect = "Enable" + + Var CustomOreoCheckState = "Enable" + Var CustomOvaltineCheckState = "Enable" + Var CustomCocoaCheckState = "Enable" + EndIf + EndIf EndIf + Else If CART1_STATUS = "EMPTY" Then @@ -6155,18 +9047,642 @@ + + + 0 + 380 + 1080 + 1540 + toppingSelectState + "ROOT/taobin_project/image/topping2/topping_revamp/alpha.png" + + + + 240 + 880 + 641 + 180 + toppingSelectState + Var( DirImage + "/topping_revamp/bg_top_popup.png" ) + + + + + 240 + oreo_y + 641 + 72 + CustomOreoState + Var( DirImage + "/topping_revamp/bg_top_oreo.png" ) + + + + + + + + 240 + ovaltine_y + 641 + 72 + CustomOvaltineState + Var( DirImage + "/topping_revamp/bg_top_ovaltine.png" ) + + + + + + + + + + + 240 + cocoa_y + 641 + 72 + CustomCocoaState + Var( DirImage + "/topping_revamp/bg_top_cocoa.png" ) + + + + + + + + + 240 + bottom_y + 641 + 120 + toppingSelectState + "ROOT/taobin_project/image/topping2/topping_revamp/bg_bottom.png" + + + + + + + 820 + 900 + 34 + 34 + toppingSelectState + "ROOT/taobin_project/image/topping2/topping_revamp/bg_exit.png" + + Var MenuReady = "-" + Var toppingSelectState = "Invisible" + Var CustomOreoState = "Invisible" + Var CustomOvaltineState = "Invisible" + Var CustomCocoaState = "Invisible" + Var CustomCollagenState = "Invisible" + + + Var CustomOreoCheckState = "Invisible" + Var CustomOvaltineCheckState = "Invisible" + Var CustomCocoaCheckState = "Invisible" + + + + + + + + + + 0 380 1080 1540 high_light_drink_type - "ROOT/taobin_project/image/topping2_en/topping_en/high_light_drink_type.png" + "ROOT/taobin_project/image/topping2/topping_revamp/high_light_drink_type.png" 543 - 920 + 715 high_light_drink_type KanitTTF 36 @@ -6314,6 +9830,31 @@ DEBUGVAR PromotionOreoToppingFreeEnable + + Topping "Select" UserSelectProductCode + DEBUGVAR UserSelectProductCode + ; Set option toppinng and pack + Topping "Select1-ID" topping1 + Topping "Select2-ID" topping2 + Topping "Select3-ID" topping3 + Topping "Select6-ID" topping6 + Topping "Select7-ID" topping7 + Topping "Select8-ID" topping8 + Topping "Select9-ID" topping9 + Topping "Select10-ID" topping10 + + Topping "ClearMultiTopping" "Test 4" + Var strMulti6_1 = "TPID=313,multiply=2" + Var strMulti6_2 = "TPID=302,multiply=1" + ;Var strMulti6_3 = "TPID=82,multiply=1" + + Topping "Multiply6-ID" strMulti6_1 + Topping "Multiply6-ID" strMulti6_2 + ;Topping "Multiply6-ID" strMulti6_3 + + Topping "Pack" ExtendDataCurr + + \ No newline at end of file