Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
0dd6f3d34e
2 changed files with 7 additions and 3 deletions
|
|
@ -92,6 +92,10 @@
|
||||||
Var PriceDrink = OriginalPrice + TOPPING_PRICE
|
Var PriceDrink = OriginalPrice + TOPPING_PRICE
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
If FromOreoDiscount11Pro = 1 Then
|
||||||
|
Var PriceDrink = OriginalPrice + TOPPING_PRICE
|
||||||
|
EndIf
|
||||||
|
|
||||||
If FromPowerUpPro = 1 Then
|
If FromPowerUpPro = 1 Then
|
||||||
Var PriceDrink = OriginalPrice
|
Var PriceDrink = OriginalPrice
|
||||||
EndIf
|
EndIf
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
|
|
||||||
If FromOreoDiscount11Pro = 1 Then
|
If FromOreoDiscount11Pro = 1 Then
|
||||||
Var OriginalPriceWithTopping = OriginalPrice + TOPPING_PRICE
|
|
||||||
Var Seeker.VendingCode = "PMD11"
|
Var Seeker.VendingCode = "PMD11"
|
||||||
Var Seeker.CodeNumber = IDNum
|
Var Seeker.CodeNumber = "00000000"
|
||||||
Var Seeker.CodeChannel = 1
|
Var Seeker.CodeChannel = 1
|
||||||
|
Var Seeker.FreeVendingCampaign = 0
|
||||||
Var Seeker.IntVendingCampaign = 11
|
Var Seeker.IntVendingCampaign = 11
|
||||||
Var PriceDrink = OriginalPriceWithTopping
|
Var Seeker.VendingCampaignRI3 = 11
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
If FromMomCocoaPro = 1 Then
|
If FromMomCocoaPro = 1 Then
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue