Merge branch 'masterpiece' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
d422d55733
70 changed files with 16954 additions and 10157 deletions
|
|
@ -492,15 +492,12 @@
|
|||
Var TOPPING_PRICE = TOPPING_PRICE + OreoPrice
|
||||
Var strMulti6_1 = "TPID=321,multiply=1"
|
||||
Var DisableUsingCode = "true"
|
||||
DEBUGVAR DisableUsingCode
|
||||
Else
|
||||
|
||||
Else
|
||||
;Var PriceDrinkTmp = PriceDrinkNoTop
|
||||
|
||||
Var strMulti6_1 = "TPID=320,multiply=0"
|
||||
|
||||
Var DisableUsingCode = "false"
|
||||
DEBUGVAR DisableUsingCode
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -510,14 +507,12 @@
|
|||
;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
|
||||
|
||||
|
|
@ -526,7 +521,6 @@
|
|||
;Var topping6 = toppingID6index3
|
||||
Var strMulti6_3 = "TPID=322,multiply=1"
|
||||
Var DisableUsingCode = "true"
|
||||
DEBUGVAR DisableUsingCode
|
||||
Else
|
||||
|
||||
;Var PriceDrinkTmp = PriceDrinkNoTop
|
||||
|
|
@ -534,61 +528,52 @@
|
|||
Var strMulti6_3 = "TPID=320,multiply=0"
|
||||
|
||||
Var DisableUsingCode = "false"
|
||||
DEBUGVAR DisableUsingCode
|
||||
|
||||
EndIf
|
||||
|
||||
If CustomMilkState[0] = "PressForever" Then
|
||||
Var strMulti11_1 = "TPID=541,multiply=1"
|
||||
Var DisableUsingCode = "true"
|
||||
DEBUGVAR DisableUsingCode
|
||||
Else
|
||||
Var strMulti11_1 = "TPID=542,multiply=0"
|
||||
Var DisableUsingCode = "false"
|
||||
DEBUGVAR DisableUsingCode
|
||||
EndIf
|
||||
|
||||
If CustomMilkState[1] = "PressForever" Then
|
||||
Var strMulti11_2 = "TPID=542,multiply=1"
|
||||
Var DisableUsingCode = "true"
|
||||
DEBUGVAR DisableUsingCode
|
||||
Else
|
||||
Var strMulti11_2 = "TPID=542,multiply=0"
|
||||
Var DisableUsingCode = "false"
|
||||
DEBUGVAR DisableUsingCode
|
||||
EndIf
|
||||
|
||||
If CustomMilkState[2] = "PressForever" Then
|
||||
Var strMulti11_3 = "TPID=543,multiply=1"
|
||||
Var DisableUsingCode = "true"
|
||||
DEBUGVAR DisableUsingCode
|
||||
Else
|
||||
Var strMulti11_3 = "TPID=542,multiply=0"
|
||||
Var DisableUsingCode = "false"
|
||||
DEBUGVAR DisableUsingCode
|
||||
EndIf
|
||||
|
||||
If CustomTaiwaneseTeaState[0] = "PressForever" Then
|
||||
Var strMulti11_4 = "TPID=546,multiply=1"
|
||||
Var DisableUsingCode = "true"
|
||||
DEBUGVAR DisableUsingCode
|
||||
Else
|
||||
Var strMulti11_4 = "TPID=546,multiply=0"
|
||||
Var DisableUsingCode = "false"
|
||||
DEBUGVAR DisableUsingCode
|
||||
EndIf
|
||||
|
||||
If CustomTaiwaneseTeaState[1] = "PressForever" Then
|
||||
Var strMulti11_5 = "TPID=547,multiply=1"
|
||||
Var DisableUsingCode = "true"
|
||||
DEBUGVAR DisableUsingCode
|
||||
Else
|
||||
Var strMulti11_5 = "TPID=547,multiply=0"
|
||||
Var DisableUsingCode = "false"
|
||||
DEBUGVAR DisableUsingCode
|
||||
EndIf
|
||||
|
||||
|
||||
DEBUGVAR DisableUsingCode
|
||||
|
||||
If CustomTaiwaneseTeaState[1] = "PressForever" Then
|
||||
Var TOPPING_PRICE = TOPPING_PRICE + TaiwaneseTeaIncreasePrice
|
||||
EndIf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue