Merge remote-tracking branch 'origin/masterpiece' into th_inter
This commit is contained in:
commit
7c084cd7c6
92 changed files with 70785 additions and 21165 deletions
|
|
@ -104,7 +104,7 @@
|
|||
|
||||
Var showCustomCoffee = "Invisible"
|
||||
|
||||
|
||||
Var showAdjust = "Invisible"
|
||||
|
||||
Var showOvaltineEnable = "Invisible"
|
||||
Var showOreoAddEnable = "Invisible"
|
||||
|
|
@ -1381,6 +1381,7 @@
|
|||
CRLFToSpace showdesc
|
||||
|
||||
If BGSugar = "Enable" Then
|
||||
Var showAdjust = "Enable"
|
||||
If SelectDrinkType = 1 Then
|
||||
If show_eng = "true" Then
|
||||
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
|
||||
|
|
@ -1881,12 +1882,24 @@
|
|||
EndIf
|
||||
|
||||
|
||||
Var SpecialMix = "Enable"
|
||||
|
||||
Var showOreoAddEnable = "Disable"
|
||||
Var showOvaltineEnable = "Disable"
|
||||
Var showCocoaEnable = "Disable"
|
||||
|
||||
|
||||
|
||||
Var CustomSyrup = "Enable"
|
||||
|
||||
Var showStrawberryEnable = "Disable"
|
||||
Var showYuzuEnable = "Disable"
|
||||
|
||||
If cold_button_state = "PressForever" Then
|
||||
Var showOreoAddEnable = "Disable"
|
||||
Var showOvaltineEnable = "Disable"
|
||||
Var showCocoaEnable = "Disable"
|
||||
|
||||
Var showStrawberryEnable = "Enable"
|
||||
Var showYuzuEnable = "Enable"
|
||||
EndIf
|
||||
|
|
@ -1895,26 +1908,49 @@
|
|||
If hot_button_state = "PressForever" Then
|
||||
Var SpecialMix = "Enable"
|
||||
Var CustomSyrup = "Enable"
|
||||
|
||||
Var showOreoAddEnable = "Disable"
|
||||
Var showOvaltineEnable = "Disable"
|
||||
Var showCocoaEnable = "Disable"
|
||||
|
||||
Var showStrawberryEnable = "Disable"
|
||||
Var showYuzuEnable = "Disable"
|
||||
EndIf
|
||||
|
||||
|
||||
If toppingID6index3Status = "" Then
|
||||
Var showCocoaEnable = "Invisible"
|
||||
EndIf
|
||||
|
||||
If toppingID6index2Status = "" Then
|
||||
If toppingID6index4Status = "" Then
|
||||
Var showOvaltineEnable = "Invisible"
|
||||
EndIf
|
||||
|
||||
If toppingID6index5Status = "" Then
|
||||
Var showStrawberryEnable = "Invisible"
|
||||
EndIf
|
||||
|
||||
If toppingID6index3Status = "" Then
|
||||
If toppingID6index6Status = "" Then
|
||||
Var showYuzuEnable = "Invisible"
|
||||
EndIf
|
||||
|
||||
If toppingID6index2Status = "Disable" Then
|
||||
Var showStrawberryEnable = "Disable"
|
||||
Var showOreoAddEnable = "Disable"
|
||||
EndIf
|
||||
|
||||
If toppingID6index3Status = "Disable" Then
|
||||
Var showCocoaEnable = "Disable"
|
||||
EndIf
|
||||
|
||||
If toppingID6index4Status = "Disable" Then
|
||||
Var showOvaltineEnable = "Disable"
|
||||
EndIf
|
||||
|
||||
If toppingID6index5Status = "Disable" Then
|
||||
Var showStrawberryEnable = "Disable"
|
||||
EndIf
|
||||
|
||||
If toppingID6index6Status = "Disable" Then
|
||||
Var showYuzuEnable = "Disable"
|
||||
EndIf
|
||||
|
||||
|
|
@ -1936,7 +1972,7 @@
|
|||
|
||||
|
||||
If TOPPING12 = "energy-drink" Then
|
||||
|
||||
Var showAdjust = "Enable"
|
||||
If toppingID12index2Status = "Enable" Then
|
||||
Var showEnergyEnable = "Enable"
|
||||
EndIf
|
||||
|
|
@ -1982,10 +2018,88 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
Var ProductSodaDisableShot = "12-05-02-0114,12-05-02-0104,12-05-02-0094"
|
||||
|
||||
Var IsSodaDisableShot = "false"
|
||||
Var IsSodaDisableShot2 = "false"
|
||||
Var IsSodaDisableShot3 = "false"
|
||||
DEBUGVAR IsSodaDisableShot
|
||||
DEBUGVAR IsSodaDisableShot2
|
||||
DEBUGVAR IsSodaDisableShot3
|
||||
STRCONTAIN PD_CODE1 ProductSodaDisableShot IsSodaDisableShot
|
||||
STRCONTAIN PD_CODE2 ProductSodaDisableShot IsSodaDisableShot2
|
||||
STRCONTAIN PD_CODE3 ProductSodaDisableShot IsSodaDisableShot3
|
||||
|
||||
DEBUGVAR IsSodaDisableShot
|
||||
DEBUGVAR IsSodaDisableShot2
|
||||
DEBUGVAR IsSodaDisableShot3
|
||||
If IsSodaDisableShot = "true" Then
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
If cold_button_state = "PressForever" Then
|
||||
If toppingID12index2Status = "Disable" Then
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
Else
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
EndIf
|
||||
Else
|
||||
If toppingID12index2Status = "Enable" Then
|
||||
Var CustomEnergyState[0] = "Enable"
|
||||
Var CustomEnergyState[1] = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If IsSodaDisableShot2 = "true" Then
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
If cold_button_state = "PressForever" Then
|
||||
If toppingID12index2Status = "Disable" Then
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
Else
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
EndIf
|
||||
Else
|
||||
If toppingID12index2Status = "Enable" Then
|
||||
Var CustomEnergyState[0] = "Enable"
|
||||
Var CustomEnergyState[1] = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If IsSodaDisableShot3 = "true" Then
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
If cold_button_state = "PressForever" Then
|
||||
If toppingID12index2Status = "Disable" Then
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
Else
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
Var CustomEnergyState[1] = "Disable"
|
||||
EndIf
|
||||
Else
|
||||
If toppingID12index2Status = "Enable" Then
|
||||
Var CustomEnergyState[0] = "Enable"
|
||||
Var CustomEnergyState[1] = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If toppingID12index2Status = "" Then
|
||||
Var CustomEnergyState[0] = "Invisible"
|
||||
Var CustomEnergyState[1] = "Invisible"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
If TOPPING13 = "shot coffee" Then
|
||||
|
||||
Var showAdjust = "Enable"
|
||||
If toppingID13index2Status = "Enable" Then
|
||||
Var showShotSodaEnable = "Enable"
|
||||
EndIf
|
||||
|
|
@ -2790,12 +2904,12 @@
|
|||
;
|
||||
If TOPPING1 = "Sugar" Then
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
|
||||
Var showAdjust = "Enable"
|
||||
If RecipeTag2 = "Topping6Step" Then
|
||||
Var BGSugar = "Invisible"
|
||||
Var BGSugarNew = "Enable"
|
||||
Else
|
||||
Var BGSugar = "Enable"
|
||||
Var showAdjust = "Enable"
|
||||
EndIf
|
||||
|
||||
Var ShiftSugarStep = 1
|
||||
|
|
@ -2850,7 +2964,7 @@
|
|||
|
||||
If TOPPING1 = "Powder Sugar for Hot" Then
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
|
||||
Var showAdjust = "Enable"
|
||||
If RecipeTag2 = "Topping6Step" Then
|
||||
Var BGSugar = "Invisible"
|
||||
Var BGSugarNew = "Enable"
|
||||
|
|
@ -2910,7 +3024,7 @@
|
|||
|
||||
If TOPPING1 = "Powder Sugar" Then
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
|
||||
Var showAdjust = "Enable"
|
||||
If RecipeTag2 = "Topping6Step" Then
|
||||
Var BGSugar = "Invisible"
|
||||
Var BGSugarNew = "Enable"
|
||||
|
|
@ -2977,7 +3091,7 @@
|
|||
|
||||
If TOPPING1 = "Sugar Premix 25" Then
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
|
||||
Var showAdjust = "Enable"
|
||||
If RecipeTag2 = "Topping6Step" Then
|
||||
Var BGSugar = "Invisible"
|
||||
Var BGSugarNew = "Enable"
|
||||
|
|
@ -3032,7 +3146,7 @@
|
|||
|
||||
If TOPPING1 = "Powder Sugar Premix 50" Then
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
|
||||
Var showAdjust = "Enable"
|
||||
If RecipeTag2 = "Topping6Step" Then
|
||||
Var BGSugar = "Invisible"
|
||||
Var BGSugarNew = "Enable"
|
||||
|
|
@ -3097,7 +3211,7 @@
|
|||
|
||||
If TOPPING1 = "Powder Sugar Premix 25" Then
|
||||
Var SugarZeroCalOption = "Enable"
|
||||
|
||||
Var showAdjust = "Enable"
|
||||
If RecipeTag2 = "Topping6Step" Then
|
||||
Var BGSugar = "Invisible"
|
||||
Var BGSugarNew = "Enable"
|
||||
|
|
@ -3591,6 +3705,10 @@
|
|||
Var ExtraTopping = "Invisible"
|
||||
EndIf
|
||||
|
||||
If showShotEnable = "Enable" Then
|
||||
Var showAdjust = "Enable"
|
||||
EndIf
|
||||
|
||||
DEBUGVAR showShotEnable
|
||||
DEBUGVAR showOreoAddEnable
|
||||
DEBUGVAR ShotCoffeePremium
|
||||
|
|
@ -4152,7 +4270,7 @@
|
|||
<Row1>
|
||||
<Width> 986 </Width>
|
||||
<Height> 64 </Height>
|
||||
<State> "Enable" </State>
|
||||
<State> showAdjust </State>
|
||||
<Image>
|
||||
<Filename> Var( DirImage + "/topping_revamp/bg_top_custom_recipe.png" ) </Filename>
|
||||
</Image>
|
||||
|
|
@ -4885,6 +5003,7 @@
|
|||
Var return = "Invisible"
|
||||
Else
|
||||
If BGSugarNew = "Enable" Then
|
||||
Var showAdjust = "Enable"
|
||||
Var return = "Enable"
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
|
|
@ -5459,6 +5578,7 @@
|
|||
<State> eval(
|
||||
If SugarZeroCalOption = "Enable" Then
|
||||
If BGSugarNew = "Enable" Then
|
||||
Var showAdjust = "Enable"
|
||||
Var return = "Enable"
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
|
|
@ -6245,6 +6365,7 @@
|
|||
Var return = "Invisible"
|
||||
Else
|
||||
If BGSugarHotHealthy = "Enable" Then
|
||||
Var showAdjust = "Enable"
|
||||
Var return = "Enable"
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
|
|
@ -6641,6 +6762,7 @@
|
|||
<State> eval(
|
||||
If SugarZeroCalOption = "Enable" Then
|
||||
If BGSugarHotHealthy = "Enable" Then
|
||||
Var showAdjust = "Enable"
|
||||
Var return = "Enable"
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
|
|
@ -6963,6 +7085,7 @@
|
|||
Var return = "Invisible"
|
||||
Else
|
||||
If BGSugarColdHealthy = "Enable" Then
|
||||
Var showAdjust = "Enable"
|
||||
Var return = "Enable"
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
|
|
@ -7261,6 +7384,7 @@
|
|||
<State> eval(
|
||||
If SugarZeroCalOption = "Enable" Then
|
||||
If BGSugarColdHealthy = "Enable" Then
|
||||
Var showAdjust = "Enable"
|
||||
Var return = "Enable"
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
|
|
@ -8379,12 +8503,12 @@
|
|||
;
|
||||
;
|
||||
<Row1>
|
||||
<State> "Enable" </State>
|
||||
<State> showAdjust </State>
|
||||
<Width> 986 </Width>
|
||||
<Height> 27 </Height>
|
||||
<Y> -5 </Y>
|
||||
<Image>
|
||||
<State> "Enable" </State>
|
||||
<State> showAdjust </State>
|
||||
<Filename> "ROOT/taobin_project/image/topping2/bg_bottom.png" </Filename>
|
||||
</Image>
|
||||
</Row1>
|
||||
|
|
@ -9921,16 +10045,16 @@
|
|||
EndIf
|
||||
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
If toppingID6index2 = 91 Then
|
||||
If toppingID6index2Status = "Enable" Then
|
||||
If toppingID6index5 = 94 Then
|
||||
If toppingID6index5Status = "Enable" Then
|
||||
Var showStrawberryEnable = "Enable"
|
||||
Else
|
||||
Var showStrawberryEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If toppingID6index3 = 92 Then
|
||||
If toppingID6index3Status = "Enable" Then
|
||||
If toppingID6index6 = 95 Then
|
||||
If toppingID6index6Status = "Enable" Then
|
||||
Var showYuzuEnable = "Enable"
|
||||
Else
|
||||
Var showYuzuEnable = "Disable"
|
||||
|
|
@ -9953,13 +10077,13 @@
|
|||
EndIf
|
||||
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
If toppingID6index2 = 91 Then
|
||||
If toppingID6index2Status = "Enable" Then
|
||||
If toppingID6index5 = 94 Then
|
||||
If toppingID6index5Status = "Enable" Then
|
||||
Var showStrawberryEnable = "Press"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If toppingID6index3 = 92 Then
|
||||
If toppingID6index6 = 95 Then
|
||||
Var showYuzuEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -10011,16 +10135,16 @@
|
|||
EndIf
|
||||
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
If toppingID6index2 = 91 Then
|
||||
If toppingID6index2Status = "Enable" Then
|
||||
If toppingID6index5 = 94 Then
|
||||
If toppingID6index5Status = "Enable" Then
|
||||
Var showStrawberryEnable = "Enable"
|
||||
Else
|
||||
Var showStrawberryEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If toppingID6index3 = 92 Then
|
||||
If toppingID6index3Status = "Enable" Then
|
||||
If toppingID6index6 = 95 Then
|
||||
If toppingID6index6Status = "Enable" Then
|
||||
Var showYuzuEnable = "Enable"
|
||||
Else
|
||||
Var showYuzuEnable = "Disable"
|
||||
|
|
@ -10043,13 +10167,13 @@
|
|||
EndIf
|
||||
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
If toppingID6index2 = 91 Then
|
||||
If toppingID6index2Status = "Enable" Then
|
||||
If toppingID6index5 = 94 Then
|
||||
If toppingID6index5Status = "Enable" Then
|
||||
Var showStrawberryEnable = "Press"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If toppingID6index3 = 92 Then
|
||||
If toppingID6index6 = 95 Then
|
||||
Var showYuzuEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -10133,16 +10257,16 @@
|
|||
EndIf
|
||||
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
If toppingID6index2 = 91 Then
|
||||
If toppingID6index2Status = "Enable" Then
|
||||
If toppingID6index5 = 94 Then
|
||||
If toppingID6index5Status = "Enable" Then
|
||||
Var showStrawberryEnable = "Enable"
|
||||
Else
|
||||
Var showStrawberryEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If toppingID6index3 = 92 Then
|
||||
If toppingID6index3Status = "Enable" Then
|
||||
If toppingID6index6 = 95 Then
|
||||
If toppingID6index6Status = "Enable" Then
|
||||
Var showYuzuEnable = "Enable"
|
||||
Else
|
||||
Var showYuzuEnable = "Disable"
|
||||
|
|
@ -10164,12 +10288,12 @@
|
|||
EndIf
|
||||
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
If toppingID6index2 = 91 Then
|
||||
If toppingID6index5 = 94 Then
|
||||
Var showStrawberryEnable = "Disable"
|
||||
EndIf
|
||||
|
||||
If toppingID6index3 = 92 Then
|
||||
If toppingID6index3Status = "Enable" Then
|
||||
If toppingID6index6 = 95 Then
|
||||
If toppingID6index6Status = "Enable" Then
|
||||
Var showYuzuEnable = "Press"
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -10226,16 +10350,16 @@
|
|||
EndIf
|
||||
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
If toppingID6index2 = 91 Then
|
||||
If toppingID6index2Status = "Enable" Then
|
||||
If toppingID6index5 = 94 Then
|
||||
If toppingID6index5Status = "Enable" Then
|
||||
Var showStrawberryEnable = "Enable"
|
||||
Else
|
||||
Var showStrawberryEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If toppingID6index3 = 92 Then
|
||||
If toppingID6index3Status = "Enable" Then
|
||||
If toppingID6index6 = 95 Then
|
||||
If toppingID6index6Status = "Enable" Then
|
||||
Var showYuzuEnable = "Enable"
|
||||
Else
|
||||
Var showYuzuEnable = "Disable"
|
||||
|
|
@ -10257,12 +10381,12 @@
|
|||
EndIf
|
||||
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
If toppingID6index2 = 91 Then
|
||||
If toppingID6index5 = 94 Then
|
||||
Var showStrawberryEnable = "Disable"
|
||||
EndIf
|
||||
|
||||
If toppingID6index3 = 92 Then
|
||||
If toppingID6index3Status = "Enable" Then
|
||||
If toppingID6index6 = 95 Then
|
||||
If toppingID6index6Status = "Enable" Then
|
||||
Var showYuzuEnable = "Press"
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -10872,7 +10996,7 @@
|
|||
EndIf
|
||||
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
Var strMulti6_5 = "TPID=91,multiply=1"
|
||||
Var strMulti6_5 = "TPID=94,multiply=1"
|
||||
EndIf
|
||||
|
||||
Var DisableUsingCode = "true"
|
||||
|
|
@ -10900,7 +11024,7 @@
|
|||
Var strMulti6_6 = "TPID=325,multiply=1"
|
||||
EndIf
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
Var strMulti6_6 = "TPID=92,multiply=1"
|
||||
Var strMulti6_6 = "TPID=95,multiply=1"
|
||||
EndIf
|
||||
Var DisableUsingCode = "true"
|
||||
Else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue