Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
wanlop run
commit
33bbc3a927
1 changed files with 87 additions and 197 deletions
|
|
@ -766,7 +766,6 @@
|
|||
|
||||
Var MenuReasonStage = "Invisible"
|
||||
Var AdvertOpened = "false"
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
|
@ -1894,9 +1893,15 @@
|
|||
|
||||
Var SpecialMix = "Enable"
|
||||
|
||||
Var showOreoAddEnable = "Disable"
|
||||
Var showOvaltineEnable = "Disable"
|
||||
Var showCocoaEnable = "Disable"
|
||||
If showOreoAddEnable = "Enable" Then
|
||||
Var showOreoAddEnable = "Disable"
|
||||
EndIf
|
||||
If showOvaltineEnable = "Enable" Then
|
||||
Var showOvaltineEnable = "Disable"
|
||||
EndIf
|
||||
If showCocoaEnable = "Enable" Then
|
||||
Var showCocoaEnable = "Disable"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
|
@ -1906,10 +1911,6 @@
|
|||
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
|
||||
|
|
@ -1919,51 +1920,30 @@
|
|||
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 toppingID6index4Status = "" Then
|
||||
Var showOvaltineEnable = "Invisible"
|
||||
EndIf
|
||||
|
||||
If toppingID6index5Status = "" Then
|
||||
If toppingID6index2Status = "" Then
|
||||
Var showStrawberryEnable = "Invisible"
|
||||
EndIf
|
||||
|
||||
If toppingID6index6Status = "" Then
|
||||
If toppingID6index3Status = "" Then
|
||||
Var showYuzuEnable = "Invisible"
|
||||
EndIf
|
||||
|
||||
If toppingID6index2Status = "Disable" Then
|
||||
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
|
||||
If toppingID6index3Status = "Disable" Then
|
||||
Var showYuzuEnable = "Disable"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
Var ExtraTopping = "Enable"
|
||||
|
||||
|
|
@ -2032,91 +2012,29 @@
|
|||
If CustomEnergyState[0] = "Enable" Then
|
||||
|
||||
If CustomEnergyState[1] = "Enable" Then
|
||||
Var CustomEnergyState[3] = "PressForever"
|
||||
Var CustomEnergyState[3] = "Press"
|
||||
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
|
||||
Else
|
||||
If CustomEnergyState[0] = "Enable" 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
|
||||
If CustomEnergyState[0] = "Press" Then
|
||||
Var CustomEnergyState[0] = "Disable"
|
||||
EndIf
|
||||
If CustomEnergyState[1] = "Enable" Then
|
||||
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"
|
||||
If CustomEnergyState[1] = "Press" Then
|
||||
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"
|
||||
If CustomEnergyState[3] = "Enable" Then
|
||||
Var CustomEnergyState[3] = "Disable"
|
||||
EndIf
|
||||
If CustomEnergyState[3] = "Press" Then
|
||||
Var CustomEnergyState[3] = "Disable"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
If TOPPING13 = "shot coffee" Then
|
||||
|
|
@ -7988,37 +7906,30 @@
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
If CustomEnergyState[3] = "Press" Then
|
||||
Var CustomEnergyState[3] = "Enable"
|
||||
|
||||
If cold_button_state = "PressForever" Then
|
||||
Var showShotNormalSoda = "Enable"
|
||||
Var showShotEnableSoda = "Enable"
|
||||
Else
|
||||
Var showShotNormalSoda = "Disable"
|
||||
Var showShotEnableSoda = "Disable"
|
||||
EndIf
|
||||
|
||||
Var CustomEnergyState[3] = "Press"
|
||||
If cold_button_state = "PressForever" Then
|
||||
Var showShotNormalSoda = "Press"
|
||||
Var showShotEnableSoda = "Disable"
|
||||
Else
|
||||
Var CustomEnergyState[3] = "Press"
|
||||
If cold_button_state = "PressForever" Then
|
||||
Var showShotNormalSoda = "Press"
|
||||
Var showShotEnableSoda = "Disable"
|
||||
Else
|
||||
Var showShotNormalSoda = "Disable"
|
||||
Var showShotEnableSoda = "Disable"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
Var showShotNormalSoda = "Disable"
|
||||
Var showShotEnableSoda = "Disable"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
If showShotNormalSoda = "Disable" Then
|
||||
Var showShotNormalSoda = "Enable"
|
||||
If toppingID13index1Status = "Enable" Then
|
||||
Var showShotNormalSoda = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If showShotEnableSoda = "Disable" Then
|
||||
Var showShotEnableSoda = "Enable"
|
||||
If toppingID13index2Status = "Enable" Then
|
||||
Var showShotEnableSoda = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var CustomEnergyState[0] = "Enable"
|
||||
|
|
@ -8047,26 +7958,16 @@
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
If CustomEnergyState[0] = "Press" Then
|
||||
Var CustomEnergyState[0] = "Enable"
|
||||
|
||||
If cold_button_state = "PressForever" Then
|
||||
Var showShotNormalSoda = "Press"
|
||||
Var showShotEnableSoda = "Enable"
|
||||
Else
|
||||
Var showShotNormalSoda = "Disable"
|
||||
Var showShotEnableSoda = "Disable"
|
||||
EndIf
|
||||
|
||||
Var CustomEnergyState[0] = "Press"
|
||||
If cold_button_state = "PressForever" Then
|
||||
Var showShotNormalSoda = "Press"
|
||||
Var showShotEnableSoda = "Disable"
|
||||
Else
|
||||
Var CustomEnergyState[0] = "Press"
|
||||
If cold_button_state = "PressForever" Then
|
||||
Var showShotNormalSoda = "Press"
|
||||
Var showShotEnableSoda = "Disable"
|
||||
Else
|
||||
Var showShotNormalSoda = "Disable"
|
||||
Var showShotEnableSoda = "Disable"
|
||||
EndIf
|
||||
Var showShotNormalSoda = "Disable"
|
||||
Var showShotEnableSoda = "Disable"
|
||||
EndIf
|
||||
|
||||
|
||||
Var CustomEnergyState[1] = "Enable"
|
||||
Var CustomEnergyState[3] = "Enable"
|
||||
|
|
@ -8095,27 +7996,16 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
If CustomEnergyState[1] = "Press" Then
|
||||
Var CustomEnergyState[1] = "Enable"
|
||||
Var CustomEnergyState[1] = "Press"
|
||||
|
||||
If cold_button_state = "PressForever" Then
|
||||
Var showShotNormalSoda = "Press"
|
||||
Var showShotEnableSoda = "Enable"
|
||||
Else
|
||||
Var showShotNormalSoda = "Disable"
|
||||
Var showShotEnableSoda = "Disable"
|
||||
EndIf
|
||||
If cold_button_state = "PressForever" Then
|
||||
Var showShotNormalSoda = "Press"
|
||||
Var showShotEnableSoda = "Disable"
|
||||
Else
|
||||
Var CustomEnergyState[1] = "Press"
|
||||
|
||||
If cold_button_state = "PressForever" Then
|
||||
Var showShotNormalSoda = "Press"
|
||||
Var showShotEnableSoda = "Disable"
|
||||
Else
|
||||
Var showShotNormalSoda = "Disable"
|
||||
Var showShotEnableSoda = "Disable"
|
||||
EndIf
|
||||
Var showShotNormalSoda = "Disable"
|
||||
Var showShotEnableSoda = "Disable"
|
||||
EndIf
|
||||
|
||||
|
||||
Var CustomEnergyState[0] = "Enable"
|
||||
Var CustomEnergyState[3] = "Enable"
|
||||
|
|
@ -10094,16 +9984,16 @@
|
|||
EndIf
|
||||
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
If toppingID6index5 = 94 Then
|
||||
If toppingID6index5Status = "Enable" Then
|
||||
If toppingID6index2 = 91 Then
|
||||
If toppingID6index2Status = "Enable" Then
|
||||
Var showStrawberryEnable = "Enable"
|
||||
Else
|
||||
Var showStrawberryEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If toppingID6index6 = 95 Then
|
||||
If toppingID6index6Status = "Enable" Then
|
||||
If toppingID6index3 = 92 Then
|
||||
If toppingID6index3Status = "Enable" Then
|
||||
Var showYuzuEnable = "Enable"
|
||||
Else
|
||||
Var showYuzuEnable = "Disable"
|
||||
|
|
@ -10126,13 +10016,13 @@
|
|||
EndIf
|
||||
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
If toppingID6index5 = 94 Then
|
||||
If toppingID6index5Status = "Enable" Then
|
||||
If toppingID6index2 = 91 Then
|
||||
If toppingID6index2Status = "Enable" Then
|
||||
Var showStrawberryEnable = "Press"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If toppingID6index6 = 95 Then
|
||||
If toppingID6index3 = 92 Then
|
||||
Var showYuzuEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -10184,16 +10074,16 @@
|
|||
EndIf
|
||||
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
If toppingID6index5 = 94 Then
|
||||
If toppingID6index5Status = "Enable" Then
|
||||
If toppingID6index2 = 91 Then
|
||||
If toppingID6index2Status = "Enable" Then
|
||||
Var showStrawberryEnable = "Enable"
|
||||
Else
|
||||
Var showStrawberryEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If toppingID6index6 = 95 Then
|
||||
If toppingID6index6Status = "Enable" Then
|
||||
If toppingID6index3 = 92 Then
|
||||
If toppingID6index3Status = "Enable" Then
|
||||
Var showYuzuEnable = "Enable"
|
||||
Else
|
||||
Var showYuzuEnable = "Disable"
|
||||
|
|
@ -10216,13 +10106,13 @@
|
|||
EndIf
|
||||
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
If toppingID6index5 = 94 Then
|
||||
If toppingID6index5Status = "Enable" Then
|
||||
If toppingID6index2 = 91 Then
|
||||
If toppingID6index2Status = "Enable" Then
|
||||
Var showStrawberryEnable = "Press"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If toppingID6index6 = 95 Then
|
||||
If toppingID6index3 = 92 Then
|
||||
Var showYuzuEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -10306,16 +10196,16 @@
|
|||
EndIf
|
||||
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
If toppingID6index5 = 94 Then
|
||||
If toppingID6index5Status = "Enable" Then
|
||||
If toppingID6index2 = 91 Then
|
||||
If toppingID6index2Status = "Enable" Then
|
||||
Var showStrawberryEnable = "Enable"
|
||||
Else
|
||||
Var showStrawberryEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If toppingID6index6 = 95 Then
|
||||
If toppingID6index6Status = "Enable" Then
|
||||
If toppingID6index3 = 92 Then
|
||||
If toppingID6index3Status = "Enable" Then
|
||||
Var showYuzuEnable = "Enable"
|
||||
Else
|
||||
Var showYuzuEnable = "Disable"
|
||||
|
|
@ -10337,12 +10227,12 @@
|
|||
EndIf
|
||||
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
If toppingID6index5 = 94 Then
|
||||
If toppingID6index2 = 91 Then
|
||||
Var showStrawberryEnable = "Disable"
|
||||
EndIf
|
||||
|
||||
If toppingID6index6 = 95 Then
|
||||
If toppingID6index6Status = "Enable" Then
|
||||
If toppingID6index3 = 92 Then
|
||||
If toppingID6index3Status = "Enable" Then
|
||||
Var showYuzuEnable = "Press"
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -10399,16 +10289,16 @@
|
|||
EndIf
|
||||
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
If toppingID6index5 = 94 Then
|
||||
If toppingID6index5Status = "Enable" Then
|
||||
If toppingID6index2 = 91 Then
|
||||
If toppingID6index2Status = "Enable" Then
|
||||
Var showStrawberryEnable = "Enable"
|
||||
Else
|
||||
Var showStrawberryEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If toppingID6index6 = 95 Then
|
||||
If toppingID6index6Status = "Enable" Then
|
||||
If toppingID6index3 = 92 Then
|
||||
If toppingID6index3Status = "Enable" Then
|
||||
Var showYuzuEnable = "Enable"
|
||||
Else
|
||||
Var showYuzuEnable = "Disable"
|
||||
|
|
@ -10430,12 +10320,12 @@
|
|||
EndIf
|
||||
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
If toppingID6index5 = 94 Then
|
||||
If toppingID6index2 = 91 Then
|
||||
Var showStrawberryEnable = "Disable"
|
||||
EndIf
|
||||
|
||||
If toppingID6index6 = 95 Then
|
||||
If toppingID6index6Status = "Enable" Then
|
||||
If toppingID6index3 = 92 Then
|
||||
If toppingID6index3Status = "Enable" Then
|
||||
Var showYuzuEnable = "Press"
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -11060,7 +10950,7 @@
|
|||
EndIf
|
||||
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
Var strMulti6_5 = "TPID=94,multiply=1"
|
||||
Var strMulti6_5 = "TPID=91,multiply=1"
|
||||
EndIf
|
||||
|
||||
Var DisableUsingCode = "true"
|
||||
|
|
@ -11088,7 +10978,7 @@
|
|||
Var strMulti6_6 = "TPID=325,multiply=1"
|
||||
EndIf
|
||||
If TOPPING6 = "syrup-topping" Then
|
||||
Var strMulti6_6 = "TPID=95,multiply=1"
|
||||
Var strMulti6_6 = "TPID=92,multiply=1"
|
||||
EndIf
|
||||
Var DisableUsingCode = "true"
|
||||
Else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue