Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
wanlop run 2025-05-16 14:32:05 +07:00
commit 0182d8dffa
8 changed files with 71 additions and 33 deletions

View file

@ -1821,10 +1821,17 @@
Var CustomMilkState[1] = "Enable"
Var CustomMilkState[2] = "Enable"
Else
Var CustomMilkState[0] = "Disable"
Var CustomMilkState[1] = "Disable"
Var CustomMilkState[2] = "Disable"
If TOPPING11 = "milk-level" Then
Var CustomMilkState[0] = "Enable"
Var CustomMilkState[1] = "Enable"
Var CustomMilkState[2] = "Enable"
Else
Var CustomMilkState[0] = "Disable"
Var CustomMilkState[1] = "Disable"
Var CustomMilkState[2] = "Disable"
EndIf
EndIf
Else
Var CustomMilkState[0] = "Disable"
Var CustomMilkState[1] = "Disable"
@ -2215,15 +2222,22 @@
Var showShotNormalSoda = "Invisible"
Var showShotEnableSoda = "Invisible"
Else
Var showShotNormalSoda = "Disable"
Var showShotEnableSoda = "Disable"
If toppingID13index2Status = "Enable" Then
Var showShotEnableSoda = "Enable"
Var showShotNormalSoda = "Enable"
Else
Var showShotNormalSoda = "Disable"
Var showShotEnableSoda = "Disable"
EndIf
EndIf
EndIf
Else
Var showShotNormalSoda = "Disable"
Var showShotEnableSoda = "Disable"
EndIf
DEBUGVAR SubMenuGroupIDSlot6_1
DEBUGVAR TOPPING3
@ -2623,6 +2637,20 @@
Var CustomMilkState[2] = "Disable"
EndIf
If TOPPING13 = "shot coffee" Then
If showShotNormalSoda = "Enable" Then
If showShotEnableSoda = "Enable" Then
Var showShotNormalSoda = "Press"
EndIf
EndIf
Else
If showShotNormal = "Enable" Then
If showShotEnable = "Enable" Then
Var showShotNormal = "Press"
EndIf
EndIf
EndIf
Var SelectToppingType = 1
EndIf
@ -2682,34 +2710,30 @@
EndIf
EndIf
If CustomMilkState[0] = "Enable" Then
Var CustomMilkState[0] = "Disable"
EndIf
If TOPPING11 = "milk-level" Then
If CustomMilkState[1] = "Enable" Then
Var CustomMilkState[1] = "Disable"
EndIf
If CustomMilkState[2] = "Enable" Then
Var CustomMilkState[2] = "Disable"
EndIf
If CustomMilkState[0] = "Disable" Then
Var CustomMilkState[0] = "Enable"
EndIf
If CustomMilkState[0] = "PressForever" Then
Var CustomMilkState[0] = "Disable"
EndIf
If CustomMilkState[1] = "Disable" Then
Var CustomMilkState[1] = "Enable"
EndIf
If CustomMilkState[2] = "Disable" Then
Var CustomMilkState[2] = "Enable"
EndIf
If CustomMilkState[1] = "PressForever" Then
Var CustomMilkState[1] = "Disable"
EndIf
If CustomMilkState[2] = "PressForever" Then
Var CustomMilkState[2] = "Disable"
EndIf
If CustomMilkState[0] = "Enable" Then
If CustomMilkState[1] = "Enable" Then
If CustomMilkState[2] = "Enable" Then
Var CustomMilkState[1] = "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
Else
Var CustomMilkState[0] = "Disable"
Var CustomMilkState[1] = "Disable"
Var CustomMilkState[2] = "Disable"
EndIf
If TOPPING13 = "shot coffee" Then