Merge remote-tracking branch 'origin/masterpiece' into th_inter
This commit is contained in:
commit
2a1a27e42f
58 changed files with 6037 additions and 11558 deletions
|
|
@ -2645,7 +2645,7 @@
|
|||
|
||||
If showShotNormalSoda = "Press" Then
|
||||
Var showShotNormalSoda = "Disable"
|
||||
Endif
|
||||
EndIf
|
||||
|
||||
If TOPPING11 = "milk-level" Then
|
||||
|
||||
|
|
@ -10956,10 +10956,25 @@
|
|||
|
||||
If CustomEnergyState[0] = "Press" Then
|
||||
Var TOPPING_PRICE = TOPPING_PRICE + EnergyPriceLevel1
|
||||
Var topping12 = toppingID12index2
|
||||
Else
|
||||
If CustomEnergyState[1] = "Press" Then
|
||||
|
||||
Else
|
||||
Var topping12 = toppingID12index1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If CustomEnergyState[1] = "Press" Then
|
||||
Var TOPPING_PRICE = TOPPING_PRICE + EnergyPriceLevel2
|
||||
Var topping12 = toppingID12index3
|
||||
Else
|
||||
If CustomEnergyState[0] = "Press" Then
|
||||
|
||||
Else
|
||||
Var topping12 = toppingID12index1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If showShotEnableSoda = "Press" Then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue