Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project
This commit is contained in:
commit
d963b995be
58 changed files with 13023 additions and 26 deletions
|
|
@ -263,6 +263,21 @@
|
|||
DEBUGVAR PriceD2
|
||||
DEBUGVAR PriceD3
|
||||
|
||||
If From15THBPro = 1 Then
|
||||
If PriceD1 > 0 Then
|
||||
Var OriginalPriceD1 = PriceD1
|
||||
Var PriceD1 = 15
|
||||
EndIf
|
||||
If PriceD2 > 0 Then
|
||||
Var OriginalPriceD2 = PriceD2
|
||||
Var PriceD2 = 15
|
||||
EndIf
|
||||
If PriceD3 > 0 Then
|
||||
Var OriginalPriceD3 = PriceD3
|
||||
Var PriceD3 = 15
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If hot_button_state = "Disable2" Then
|
||||
Var text_price_d1 = ""
|
||||
Else
|
||||
|
|
@ -4133,6 +4148,7 @@
|
|||
|
||||
If hot_button_state = "PressForever" Then
|
||||
Var PriceDrinkNoTop = PriceD1
|
||||
Var OriginalPrice = OriginalPriceD1
|
||||
Var UserSelectProductCode = PD_CODE1
|
||||
|
||||
If showShotEnable = "Disable" Then
|
||||
|
|
@ -4159,6 +4175,7 @@
|
|||
|
||||
If cold_button_state = "PressForever" Then
|
||||
Var PriceDrinkNoTop = PriceD2
|
||||
Var OriginalPrice = OriginalPriceD2
|
||||
Var UserSelectProductCode = PD_CODE2
|
||||
|
||||
If showShotEnable = "Disable" Then
|
||||
|
|
@ -4185,6 +4202,7 @@
|
|||
|
||||
If blend_button_state = "PressForever" Then
|
||||
Var PriceDrinkNoTop = PriceD3
|
||||
Var OriginalPrice = OriginalPriceD3
|
||||
Var UserSelectProductCode = PD_CODE3
|
||||
|
||||
If showShotEnable = "Invisible" Then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue